[oe-commits] org.oe.dev initscripts: add an extra check to checkroot.sh, inspired by the logicpd cset earlier

[koen commit]

initscripts: add an extra check to checkroot.sh, inspired by the logicpd cset earlier

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 46b07c78864648b21e7b885096464b61a30fa717
ViewMTN: http://monotone.openembedded.org/revision.psp?id=46b07c78864648b21e7b885096464b61a30fa717
Files:
1
packages/initscripts/initscripts-1.0/checkroot.sh
packages/initscripts/initscripts_1.0.bb
Diffs:

#
# mt diff -rdea0b7b38254b1459e930b51019caa463531a545 -r46b07c78864648b21e7b885096464b61a30fa717
#
# 
# 
# patch "packages/initscripts/initscripts-1.0/checkroot.sh"
#  from [9fcbc869545c753200dfa0f15501f0fb1f7730aa]
#    to [b17337e6503486a51b8eaf06ab4de7f61b7f8f2a]
# 
# patch "packages/initscripts/initscripts_1.0.bb"
#  from [8888dafb5c555df1b36a0ca9f10092423ada2862]
#    to [184c85d6aa03815816d40e0e59673bf7b8c1d5ac]
# 
============================================================
--- packages/initscripts/initscripts-1.0/checkroot.sh	9fcbc869545c753200dfa0f15501f0fb1f7730aa
+++ packages/initscripts/initscripts-1.0/checkroot.sh	b17337e6503486a51b8eaf06ab4de7f61b7f8f2a
@@ -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
============================================================
--- packages/initscripts/initscripts_1.0.bb	8888dafb5c555df1b36a0ca9f10092423ada2862
+++ packages/initscripts/initscripts_1.0.bb	184c85d6aa03815816d40e0e59673bf7b8c1d5ac
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r76"
+PR = "r77"
 
 SRC_URI = "file://halt \
            file://ramdisk \