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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-12 00:00:14 +0000 (Thu, 12 Jan 2006)
New Revision: 612

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
Log:
Reduce verbosity when VERBOSE is no

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2006-01-11 23:52:31 UTC (rev 611)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2006-01-12 00:00:14 UTC (rev 612)
@@ -25,7 +25,7 @@
 		on_ac_power >/dev/null 2>&1
 		if [ $? -eq 1 ]
 		then
-			log_success_msg "Running on battery power, so skipping file system check."
+			[ "$VERBOSE" != no ] && log_success_msg "Running on battery power, so skipping file system check."
 			BAT=yes
 		fi
 	fi

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-01-11 23:52:31 UTC (rev 611)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-01-12 00:00:14 UTC (rev 612)
@@ -191,7 +191,7 @@
 			log_failure_msg "Attempt to start maintenance shell failed. Will reboot in 5 seconds."
 			sleep 5
 		fi
-		log_action_msg "Will now request reboot"
+		[ "$VERBOSE" != no ] && log_action_msg "Will now request reboot"
 		reboot -f
 	fi
 
@@ -323,7 +323,7 @@
 			log_failure_msg "Attempt to start maintenance shell failed. Will reboot in 5 seconds."
 			sleep 5
 		fi
-		log_action_msg "Will now request reboot"
+		[ "$VERBOSE" != no ] && log_action_msg "Will now request reboot"
 		reboot -f
 	elif [ "$FSCKCODE" -gt 1 ]
 	then
@@ -331,7 +331,7 @@
 but requested that the system be rebooted."
 		log_warning_msg "The system will be rebooted in 5 seconds."
 		sleep 5
-		log_action_msg "Will now request reboot"
+		[ "$VERBOSE" != no ] && log_action_msg "Will now request reboot"
 		reboot -f
 	fi