From: Phil Blundell <philb@gnu.org>
Date: Sun, 28 Jan 2007 16:45:45 +0000 (+0000)
Subject: initscripts: tweak mtab reading in checkroot.sh so that r/w ramdisk
X-Git-Tag: Release-2010-05/1~9328
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f5f3f87a526b585717f3064a8db5a2e6ae849ec;p=openembedded.git

initscripts: tweak mtab reading in checkroot.sh so that r/w ramdisk
works on epia
---

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 \