summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpackages/initscripts/initscripts-1.0/checkroot.sh7
-rw-r--r--packages/initscripts/initscripts_1.0.bb2
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 \