diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-08-25 10:16:59 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2006-08-25 10:16:59 +0000 |
| commit | 27d718fcf90567a8be2f694e01a6878d1a070118 (patch) | |
| tree | 307514267ef2849fe0c3bf898980ddbf4ddf0a5f /packages | |
| parent | b007bb8a853a60ab918584da2e89ca75b21ab543 (diff) | |
| parent | 5a7bb23659fa97a1ac55bf6769605cf342a62911 (diff) | |
merge of '1ee32088f5f2a9a808845cf1074bbe5566d7be4a'
and '6651fb704192756bf7c80d213d5cb1e48a1541dd'
Diffstat (limited to 'packages')
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/checkroot.sh | 5 | ||||
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/devices | 2 | ||||
| -rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh index 8255038c32..0283e1acca 100755 --- a/packages/initscripts/initscripts-1.0/checkroot.sh +++ b/packages/initscripts/initscripts-1.0/checkroot.sh @@ -148,7 +148,12 @@ fi # remount the rootfs rw but do not try to change mtab because it # is on a ro fs until the remount succeeded. Then clean up old mtabs # and finally write the new mtab. +# This part is only needed if the rootfs was mounted ro. # +if [ $(grep rootfs /proc/mounts | awk '{print $4}') = rw ]; then + exit 0 +fi +echo "Remounting root file system..." mount -n -o remount,$rootmode / if test "$rootmode" = rw then diff --git a/packages/initscripts/initscripts-1.0/devices b/packages/initscripts/initscripts-1.0/devices index 28fb71fe3f..fb0f851d16 100755 --- a/packages/initscripts/initscripts-1.0/devices +++ b/packages/initscripts/initscripts-1.0/devices @@ -6,7 +6,7 @@ . /etc/default/rcS # exit without doing anything if udev is active -if test -e /dev/.udevdb; then +if test -e /dev/.udev -o -e /dev/.udevdb; then exit 0 fi diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 0d14403a36..29747d41c2 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r74" +PR = "r75" SRC_URI = "file://halt \ file://ramdisk \ |