diff options
| author |   Koen Kooi <koen@openembedded.org> | 2006-10-21 20:04:35 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2006-10-21 20:04:35 +0000 |
| commit | 05abf91efc854c1cc367c80466a717fedb307c7c (patch) | |
| tree | 5f7b09bb260f26305d83efd7c3a1d4a9e9595394 /packages/initscripts | |
| parent | dc82e29ee27463259f538e176507efd6fcc13613 (diff) | |
| download | openembedded-05abf91efc854c1cc367c80466a717fedb307c7c.tar.gz | |
initscripts: add an extra check to checkroot.sh, inspired by the logicpd cset earlier
Diffstat (limited to 'packages/initscripts')
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/checkroot.sh | 7 | ||||
| -rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh index 0283e1acca..3729072656 100755 --- a/packages/initscripts/initscripts-1.0/checkroot.sh +++ b/packages/initscripts/initscripts-1.0/checkroot.sh @@ -153,6 +153,13 @@ fi if [ $(grep rootfs /proc/mounts | awk '{print $4}') = rw ]; then exit 0 fi + +# Add a second check, which seems to be needed for some kernel versions +if [ $(grep "/dev/root" /proc/mounts | awk '{print $4}') = rw ]; then + exit 0 +fi + + echo "Remounting root file system..." mount -n -o remount,$rootmode / if test "$rootmode" = rw diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 928caae19d..005b8cfab6 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -5,7 +5,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r76" +PR = "r77" SRC_URI = "file://halt \ file://ramdisk \ |