diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-08-25 10:54:15 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2006-08-25 10:54:15 +0000 |
| commit | eda0f252ca2dab0aff072e134bfa482a91066490 (patch) | |
| tree | 055a7c647cc2bf31379bbc57e3691d5103072a0e /packages/initscripts | |
| parent | cf5b9a1071cea6f65d9abe979c9c42d4542efb63 (diff) | |
| parent | 15fe10f53b83794d42ff5d59b9006e21cc3f7652 (diff) | |
merge of 08b0e7058f8944b597207b5f969021dea13443c9
and d9256d2a6f06908a4b219e63c0e662263d139874
Diffstat (limited to 'packages/initscripts')
| -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 \ |