diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-03-23 23:32:58 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-03-23 23:32:58 +0000 |
| commit | 7f60e4b4e7d9b45bfe4b76802a2e82bb4edbba9f (patch) | |
| tree | b1ca54365729e3a4ac05c93616beb1207e497873 /openembedded/packages/initscripts/initscripts-1.0/openslug/devices.patch | |
| parent | 5d530ad71d08c3ebf127c6844969359c3a06a6ed (diff) | |
| download | poky-7f60e4b4e7d9b45bfe4b76802a2e82bb4edbba9f.tar.gz | |
Sync initscripts with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@331 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/initscripts/initscripts-1.0/openslug/devices.patch')
| -rw-r--r-- | openembedded/packages/initscripts/initscripts-1.0/openslug/devices.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/openembedded/packages/initscripts/initscripts-1.0/openslug/devices.patch b/openembedded/packages/initscripts/initscripts-1.0/openslug/devices.patch deleted file mode 100644 index 26b1841d5b..0000000000 --- a/openembedded/packages/initscripts/initscripts-1.0/openslug/devices.patch +++ /dev/null | |||
| @@ -1,52 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Patch to allow /dev to reside permanently in the file | ||
| 3 | # system. | ||
| 4 | # | ||
| 5 | --- old/devices 2005-05-28 21:51:39.012078699 -0700 | ||
| 6 | +++ new/devices 2005-06-12 00:16:29.222686303 -0700 | ||
| 7 | @@ -6,7 +6,7 @@ | ||
| 8 | . /etc/default/rcS | ||
| 9 | |||
| 10 | # exit without doing anything if udev is active | ||
| 11 | -if test -e /dev/.udevdb; then | ||
| 12 | +if test -e /dev/.udevdb -o -e /dev/.permanent; then | ||
| 13 | exit 0 | ||
| 14 | fi | ||
| 15 | |||
| 16 | @@ -37,12 +37,20 @@ | ||
| 17 | mknod /dev/ppp c 108 0 | ||
| 18 | if test "$VERBOSE" != "no"; then echo "done"; fi | ||
| 19 | else | ||
| 20 | - if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi | ||
| 21 | - mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev | ||
| 22 | - if test $? -ne 0; then | ||
| 23 | - if test "$VERBOSE" != "no"; then echo "failed"; fi | ||
| 24 | + if test -e /dev/.noram | ||
| 25 | + then | ||
| 26 | + # There should be no files, any files will damage the | ||
| 27 | + # makedevs script below. | ||
| 28 | + rm $(find /dev -type f -print) | ||
| 29 | + :>/dev/.noram | ||
| 30 | else | ||
| 31 | - if test "$VERBOSE" != "no"; then echo "done"; fi | ||
| 32 | + if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi | ||
| 33 | + mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev | ||
| 34 | + if test $? -ne 0; then | ||
| 35 | + if test "$VERBOSE" != "no"; then echo "failed"; fi | ||
| 36 | + else | ||
| 37 | + if test "$VERBOSE" != "no"; then echo "done"; fi | ||
| 38 | + fi | ||
| 39 | fi | ||
| 40 | if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi | ||
| 41 | cd / | ||
| 42 | @@ -60,6 +68,10 @@ | ||
| 43 | if test "$VERBOSE" != "no"; then echo "failed"; fi | ||
| 44 | else | ||
| 45 | if test "$VERBOSE" != "no"; then echo "done"; fi | ||
| 46 | + if test -e /dev/.noram | ||
| 47 | + then | ||
| 48 | + :>/dev/.permanent | ||
| 49 | + fi | ||
| 50 | fi | ||
| 51 | fi | ||
| 52 | |||
