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

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-14 08:21:02 +0000 (Thu, 14 Sep 2006)
New Revision: 922

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
Log:
  * Add /usr/bin/ to the checkroot and checkfs PATH, to make sure
    on_ac_power is used if it is available.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-13 07:01:31 UTC (rev 921)
+++ sysvinit/trunk/debian/changelog	2006-09-14 08:21:02 UTC (rev 922)
@@ -34,6 +34,8 @@
     binaries.  This avoids shutdown problems on some
     machines. (Closes: #354163)
   * Fix typo in init.d/README. (Closes: #387236)
+  * Add /usr/bin/ to the checkroot and checkfs PATH, to make sure
+    on_ac_power is used if it is available.
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 11 Sep 2006 00:44:44 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2006-09-13 07:01:31 UTC (rev 921)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2006-09-14 08:21:02 UTC (rev 922)
@@ -10,7 +10,9 @@
 # Short-Description: Check all filesystems.
 ### END INIT INFO
 
-PATH=/sbin:/bin
+# Include /usr/bin in path to find on_ac_power if /usr/ is on the root
+# partition.
+PATH=/sbin:/bin:/usr/bin
 FSCK_LOGFILE=/var/log/fsck/checkfs
 [ "$FSCKFIX" ] || FSCKFIX=no
 . /lib/init/vars.sh

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-09-13 07:01:31 UTC (rev 921)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-09-14 08:21:02 UTC (rev 922)
@@ -10,7 +10,9 @@
 # Short-Description: Check to root file system.
 ### END INIT INFO
 
-PATH=/lib/init:/sbin:/bin
+# Include /usr/bin in path to find on_ac_power if /usr/ is on the root
+# partition.
+PATH=/lib/init:/sbin:/bin:/usr/bin
 FSCK_LOGFILE=/var/log/fsck/checkroot
 [ "$FSCKFIX" ] || FSCKFIX=no
 [ "$SULOGIN" ] || SULOGIN=no