[oe-commits] org.oe.oz354x initscripts: Enable fsck of / on boot based on a variable from /etc/default/rcS

[coredump commit]

initscripts: Enable fsck of / on boot based on a variable from /etc/default/rcS

Author: coredump at openembedded.org
Branch: org.openembedded.oz354x
Revision: 3b9f8e537110fad9733489d85c64e26264984909
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3b9f8e537110fad9733489d85c64e26264984909
Files:
1
packages/initscripts/initscripts-1.0/checkroot.sh
packages/initscripts/initscripts_1.0.bb
Diffs:

#
# mt diff -r1207674d3f1e8e5e6a9fd8ee0a1fdd7b0db739e4 -r3b9f8e537110fad9733489d85c64e26264984909
#
# 
# 
# patch "packages/initscripts/initscripts-1.0/checkroot.sh"
#  from [3763a7e7acf6f242858d157dce551551f3666007]
#    to [19468722ba87ee7ddc80367066affa16eaec9f7d]
# 
# patch "packages/initscripts/initscripts_1.0.bb"
#  from [589606b0cb0bbe716460f5be5ab504eb2f273e9f]
#    to [af1e458501c1e9213cdb25c0e15fcbe4d00a6f70]
# 
============================================================
--- packages/initscripts/initscripts-1.0/checkroot.sh	3763a7e7acf6f242858d157dce551551f3666007
+++ packages/initscripts/initscripts-1.0/checkroot.sh	19468722ba87ee7ddc80367066affa16eaec9f7d
@@ -24,7 +24,7 @@ rootopts=rw
 exec 9>&0 </etc/fstab
 rootmode=rw
 rootopts=rw
-rootcheck=no
+test "$ENABLE_ROOTFS_FSCK" = yes && rootcheck="yes" || rootcheck="no"
 swap_on_md=no
 devfs=
 while read fs mnt type opts dump pass junk
@@ -44,15 +44,20 @@ do
 			test "$type" = swap && swap_on_md=yes
 			;;
 	esac
+	
 	test "$type" = devfs && devfs="$fs"
-	test "$mnt" != / && continue
-	rootopts="$opts"
-	test "$pass" = 0 -o "$pass" = "" && rootcheck=no
-	case "$opts" in
-		ro|ro,*|*,ro|*,ro,*)
-			rootmode=ro
-			;;
-	esac
+
+	if test "$mnt" = "/"
+	then
+#		echo "[$fs] [$mnt] [$type] [$opts] [$dump] [$pass] [$junk]"
+		rootopts="$opts"
+		test "$pass" = 0 -o "$pass" = "" && rootcheck=no
+		case "$opts" in
+			ro|ro,*|*,ro|*,ro,*)
+				rootmode=ro
+				;;
+		esac
+	fi
 done
 exec 0>&9 9>&-
 
============================================================
--- packages/initscripts/initscripts_1.0.bb	589606b0cb0bbe716460f5be5ab504eb2f273e9f
+++ packages/initscripts/initscripts_1.0.bb	af1e458501c1e9213cdb25c0e15fcbe4d00a6f70
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r70"
+PR = "r71"
 
 SRC_URI = "file://halt \
            file://ramdisk \