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

[Petter Reinholdtsen]

Author: pere
Date: 2006-07-14 11:03:21 +0000 (Fri, 14 Jul 2006)
New Revision: 794

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
Log:
  * Modify the comment before the calls to on_ac_power, to document
    that checkfs.sh and checkroot.sh are written to work just fine
    when /usr/bin/on_ac_power is unavailable.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-07-14 10:23:40 UTC (rev 793)
+++ sysvinit/trunk/debian/changelog	2006-07-14 11:03:21 UTC (rev 794)
@@ -15,6 +15,9 @@
   * Improve text in init.d/README to make it more obvious that the .sh
     scripts should be working when executed individually.  Patch from
     Bart Martens.  (Closes: #362888)
+  * Modify the comment before the calls to on_ac_power, to document
+    that checkfs.sh and checkroot.sh are written to work just fine
+    when /usr/bin/on_ac_power is unavailable.
   * Acknoledge NMU.  Thanks, Steinar H. Gunderson . (Closes: #359176)
 
   [ Thomas Hood ]

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2006-07-14 10:23:40 UTC (rev 793)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2006-07-14 11:03:21 UTC (rev 794)
@@ -18,8 +18,9 @@
 . /lib/lsb/init-functions
 
 do_start () {
-	# See if we're on AC Power
-	# If not, we're not gonna run our check
+	# See if we're on AC Power.  If not, we're not gonna run our
+	# check.  If on_ac_power (in /usr/) is unavailable, behave as
+	# before and check all file systems needing it.
 	if which on_ac_power >/dev/null 2>&1
 	then
 		on_ac_power >/dev/null 2>&1

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-07-14 10:23:40 UTC (rev 793)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-07-14 11:03:21 UTC (rev 794)
@@ -185,8 +185,9 @@
 		reboot -f
 	fi
 
-	# See if we're on AC Power
-	# If not, we're not gonna run our check
+	# See if we're on AC Power.  If not, we're not gonna run our
+	# check.  If on_ac_power (in /usr/) is unavailable, behave as
+	# before and check all file systems needing it.
 	if which on_ac_power >/dev/null 2>&1 && [ "$rootcheck" = yes ]
 	then
 		on_ac_power >/dev/null 2>&1