[Pkg-sysvinit-commits] r1544 - in sysvinit/trunk/debian: . initscripts/etc/init.d

[Kel Modderman]

Author: kelmo-guest
Date: 2009-07-26 07:43:54 +0000 (Sun, 26 Jul 2009)
New Revision: 1544

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
Log:
Also allow fastboot on kernel cmdline to have same effect as touching
/fastboot in checkfs.sh and checkroot.sh.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-25 18:30:03 UTC (rev 1543)
+++ sysvinit/trunk/debian/changelog	2009-07-26 07:43:54 UTC (rev 1544)
@@ -9,8 +9,10 @@
   [ Kel Modderman ]
   * Allow forcefsck on kernel cmdline to have same effect as touching
     /forcefsck in checkfs.sh and checkroot.sh. (Closes: #529498)
+  * Also allow fastboot on kernel cmdline to have same effect as touching
+    /fastboot in checkfs.sh and checkroot.sh.
 
- -- Kel Modderman <kel at otaku42.de>  Sun, 26 Jul 2009 04:29:56 +1000
+ -- Kel Modderman <kel at otaku42.de>  Sun, 26 Jul 2009 17:41:35 +1000
 
 sysvinit (2.87dsf-1) unstable; urgency=low
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2009-07-25 18:30:03 UTC (rev 1543)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2009-07-26 07:43:54 UTC (rev 1544)
@@ -38,11 +38,18 @@
 #		fi
 #	fi
 	BAT=""
+	fscheck="yes"
 
+	if [ -f /fastboot ] || grep -w -q -i "fastboot" /proc/cmdline
+	then
+		[ "$fscheck" = yes ] && log_warning_msg "Fast boot enabled, so skipping file system check."
+		fscheck=no
+	fi
+
 	#
 	# Check the rest of the file systems.
 	#
-	if [ ! -f /fastboot ] && [ ! "$BAT" ] && [ "$FSCKTYPES" != "none" ]
+	if [ "$fscheck" = yes ] && [ ! "$BAT" ] && [ "$FSCKTYPES" != "none" ]
 	then
 		if [ -f /forcefsck ] || grep -w -q -i "forcefsck" /proc/cmdline
 		then

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2009-07-25 18:30:03 UTC (rev 1543)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2009-07-26 07:43:54 UTC (rev 1544)
@@ -211,9 +211,9 @@
 	# See if we want to check the root file system.
 	#
 	FSCKCODE=0
-	if [ -f /fastboot ]
+	if [ -f /fastboot ] || grep -w -q -i "fastboot" /proc/cmdline
 	then
-		[ "$rootcheck" = yes ] && log_warning_msg "Fast boot enabled, so skipping file system check."
+		[ "$rootcheck" = yes ] && log_warning_msg "Fast boot enabled, so skipping root file system check."
 		rootcheck=no
 	fi