[Pkg-sysvinit-commits] r1545 - sysvinit/trunk/debian/initscripts/etc/init.d

[Kel Modderman]

Author: kelmo-guest
Date: 2009-07-26 07:45:55 +0000 (Sun, 26 Jul 2009)
New Revision: 1545

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
Log:
Use grep -s instead of -q to ensure no excess noise is made if for some reason /proc/cmdline was not present.

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2009-07-26 07:43:54 UTC (rev 1544)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2009-07-26 07:45:55 UTC (rev 1545)
@@ -40,7 +40,7 @@
 	BAT=""
 	fscheck="yes"
 
-	if [ -f /fastboot ] || grep -w -q -i "fastboot" /proc/cmdline
+	if [ -f /fastboot ] || grep -s -w -i "fastboot" /proc/cmdline
 	then
 		[ "$fscheck" = yes ] && log_warning_msg "Fast boot enabled, so skipping file system check."
 		fscheck=no
@@ -51,7 +51,7 @@
 	#
 	if [ "$fscheck" = yes ] && [ ! "$BAT" ] && [ "$FSCKTYPES" != "none" ]
 	then
-		if [ -f /forcefsck ] || grep -w -q -i "forcefsck" /proc/cmdline
+		if [ -f /forcefsck ] || grep -s -w -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-26 07:43:54 UTC (rev 1544)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2009-07-26 07:45:55 UTC (rev 1545)
@@ -211,7 +211,7 @@
 	# See if we want to check the root file system.
 	#
 	FSCKCODE=0
-	if [ -f /fastboot ] || grep -w -q -i "fastboot" /proc/cmdline
+	if [ -f /fastboot ] || grep -s -w -i "fastboot" /proc/cmdline
 	then
 		[ "$rootcheck" = yes ] && log_warning_msg "Fast boot enabled, so skipping root file system check."
 		rootcheck=no
@@ -247,7 +247,7 @@
 	#
 	if [ "$rootcheck" = yes ]
 	then
-		if [ -f /forcefsck ] || grep -w -q -i "forcefsck" /proc/cmdline
+		if [ -f /forcefsck ] || grep -s -w -i "forcefsck" /proc/cmdline
 		then
 			force="-f"
 		else