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

[Petter Reinholdtsen]

Author: pere
Date: 2009-10-25 10:07:00 +0000 (Sun, 25 Oct 2009)
New Revision: 1797

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/initscripts/etc/init.d/checkroot.sh
Log:
Rewrite init.d/mtab.sh and init.d/checkroot.sh to not use
/usr/bin/which, as it is running before /usr/ is guaranteed to be
available.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-10-17 12:45:06 UTC (rev 1796)
+++ sysvinit/trunk/debian/changelog	2009-10-25 10:07:00 UTC (rev 1797)
@@ -13,8 +13,9 @@
   * Drop optional dependency from checkfs to cryptdisks, the
     cryptdisks script have a reverse dependency on checkfs, and that
     is a better way to do it.
-  * Rewrite init.d/mtab.sh to not use /usr/bin/which, as it is running
-    before /usr/ is guaranteed to be available.
+  * Rewrite init.d/mtab.sh and init.d/checkroot.sh to not use
+    /usr/bin/which, as it is running before /usr/ is guaranteed to be
+    available.
   * Rewrite /lib/init/usplash-fsck-functions.sh to use blkid instead of
     the now obsolete vol_id.  Patch from Martin Pitt and Ubuntu.
   * Update 91_sulogin_lockedpw.dpatch to include documentation,

Modified: sysvinit/trunk/debian/src/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/src/initscripts/etc/init.d/checkroot.sh	2009-10-17 12:45:06 UTC (rev 1796)
+++ sysvinit/trunk/debian/src/initscripts/etc/init.d/checkroot.sh	2009-10-25 10:07:00 UTC (rev 1797)
@@ -68,7 +68,7 @@
 		  /dev/*)
 			;;
 		  LABEL=*|UUID=*)
-			if [ "$MTPT" = "/" ] && which findfs >/dev/null 2>&1
+			if [ "$MTPT" = "/" ] && [ -x /sbin/findfs ]
 			then
 				DEV="$(findfs "$DEV")"
 			fi