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

[Petter Reinholdtsen]

Author: pere
Date: 2009-09-30 08:36:11 +0000 (Wed, 30 Sep 2009)
New Revision: 1787

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/initscripts/etc/init.d/mtab.sh
Log:
Rewrite init.d/mtab.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-09-25 18:15:19 UTC (rev 1786)
+++ sysvinit/trunk/debian/changelog	2009-09-30 08:36:11 UTC (rev 1787)
@@ -13,6 +13,8 @@
   * 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.
 
   [ Henrique de Moraes Holschuh ]
   * invoke-rc.d: return exit status 4 when action "status" is denied,

Modified: sysvinit/trunk/debian/src/initscripts/etc/init.d/mtab.sh
===================================================================
--- sysvinit/trunk/debian/src/initscripts/etc/init.d/mtab.sh	2009-09-25 18:15:19 UTC (rev 1786)
+++ sysvinit/trunk/debian/src/initscripts/etc/init.d/mtab.sh	2009-09-30 08:36:11 UTC (rev 1787)
@@ -100,7 +100,7 @@
 		:> /etc/mtab
 		chmod 644 /etc/mtab
 	fi
-	if selinux_enabled && which restorecon >/dev/null 2>&1 && [ -r /etc/mtab ]
+	if selinux_enabled && [ -x /sbin/restorecon ] && [ -r /etc/mtab ]
 	then
 		restorecon /etc/mtab
 	fi