summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2007-01-28 16:45:45 +0000
committerPhil Blundell <philb@gnu.org>2007-01-28 16:45:45 +0000
commit8f5f3f87a526b585717f3064a8db5a2e6ae849ec (patch)
treeca2bb84a1e97666a3bf32a31c5262b1e5ef727bc
parentc3189e96dadbfcbf162cc3b23ea4c1d53ab2f8d4 (diff)
initscripts: tweak mtab reading in checkroot.sh so that r/w ramdisk
works on epia
-rwxr-xr-xpackages/initscripts/initscripts-1.0/checkroot.sh13
-rw-r--r--packages/initscripts/initscripts_1.0.bb2
2 files changed, 7 insertions, 8 deletions
diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh
index cb0a940c7d..8a02aa7b58 100755
--- a/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/checkroot.sh
@@ -189,16 +189,15 @@ fi
# 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
+ROOTFSDEV="/dev/root"
+if ! grep -q "^$ROOTFSDEV\w" /proc/mounts; then
+ ROOTFSDEV="rootfs"
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
+if [ $(grep "^$ROOTFSDEV\w" /proc/mounts | awk '{print $4}') = rw ]; then
+ echo "Root filesystem already read-write, not remounting"
+ 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 0648ceea19..06a6017e15 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 = "r85"
+PR = "r86"
SRC_URI = "file://halt \
file://ramdisk \