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

[Kel Modderman]

Author: kelmo-guest
Date: 2009-07-25 18:30:03 +0000 (Sat, 25 Jul 2009)
New Revision: 1543

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
Log:
Allow forcefsck on kernel cmdline to have same effect as touching
/forcefsck in checkfs.sh and checkroot.sh. (Closes: #529498)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-25 18:27:06 UTC (rev 1542)
+++ sysvinit/trunk/debian/changelog	2009-07-25 18:30:03 UTC (rev 1543)
@@ -1,12 +1,17 @@
 sysvinit (2.87dsf-2) UNRELEASED; urgency=low
 
+  [ Petter Reinholdtsen ]
   * Start generating MD5 sum files using dh_md5sum, build-depend
     on debhelper for this.
   * Drop the stop calls for K11mountoverflowtmp in runlevels 0 and 6.
     The umountfs script will take care of the task (Closes: 526733)
 
- -- Petter Reinholdtsen <pere at debian.org>  Sat, 25 Jul 2009 19:48:02 +0200
+  [ Kel Modderman ]
+  * Allow forcefsck on kernel cmdline to have same effect as touching
+    /forcefsck in checkfs.sh and checkroot.sh. (Closes: #529498)
 
+ -- Kel Modderman <kel at otaku42.de>  Sun, 26 Jul 2009 04:29:56 +1000
+
 sysvinit (2.87dsf-1) unstable; urgency=low
 
   * New upstream release.

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2009-07-25 18:27:06 UTC (rev 1542)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2009-07-25 18:30:03 UTC (rev 1543)
@@ -44,7 +44,7 @@
 	#
 	if [ ! -f /fastboot ] && [ ! "$BAT" ] && [ "$FSCKTYPES" != "none" ]
 	then
-		if [ -f /forcefsck ]
+		if [ -f /forcefsck ] || grep -w -q -i "forcefsck" /proc/cmdline
 		then
 			force="-f"
 		else

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2009-07-25 18:27:06 UTC (rev 1542)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2009-07-25 18:30:03 UTC (rev 1543)
@@ -247,7 +247,7 @@
 	#
 	if [ "$rootcheck" = yes ]
 	then
-		if [ -f /forcefsck ]
+		if [ -f /forcefsck ] || grep -w -q -i "forcefsck" /proc/cmdline
 		then
 			force="-f"
 		else