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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-11-29 10:07:26 +0000 (Tue, 29 Nov 2005)
New Revision: 330

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/killprocs
   sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
Log:
Use which command to check for executability instead of fixed paths

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh	2005-11-29 09:54:56 UTC (rev 329)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh	2005-11-29 10:07:26 UTC (rev 330)
@@ -106,26 +106,19 @@
 }
 
 bootclean() {
-	# Only run if find and xargs are available.
-	if [ ! -x /bin/find ] && [ ! -x /usr/bin/find ]
-	then
-		return 0
-	fi
-	if [ ! -x /bin/xargs ] && [ ! -x /usr/bin/xargs ]
-	then
-		return 0
-	fi
+	which find >/dev/null || return 0
+	which xargs >/dev/null || return 0
 
-	# If there are /tmp/.clean files which have not been created
-	# by root remove them
+	# If there are /tmp/.clean files that have not been created by root
+	# then remove them
 	for cleandir in /tmp /var/run /var/lock
 	do
 		if [ -f $cleandir/.clean ]
 		then
-			[ -x /usr/bin/stat ] && cleanuid=`/usr/bin/stat -c %u $cleandir/.clean`
+			which stat >/dev/null && cleanuid=`stat -c %u $cleandir/.clean`
 			# Poor's man stat %u, since stat (and /usr) might not be
 			# available in some bootup stages
-			[ -z "$cleanuid" ] && cleanuid=`/bin/find $cleandir/.clean -printf %U`
+			[ -z "$cleanuid" ] && cleanuid=`find $cleandir/.clean -printf %U`
 			[ "$cleanuid" -ne 0 ] && rm -f $cleandir/.clean
 		fi
 	done

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2005-11-29 09:54:56 UTC (rev 329)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2005-11-29 10:07:26 UTC (rev 330)
@@ -50,7 +50,7 @@
 	fi
 
 	# Save kernel messages in /var/log/dmesg
-	if which dmesg >/dev/null 2>&1
+	if which dmesg >/dev/null
 	then
 		savelog -q -p -c 5 /var/log/dmesg
 		dmesg -s 524288 > /var/log/dmesg

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-11-29 09:54:56 UTC (rev 329)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-11-29 10:07:26 UTC (rev 330)
@@ -40,7 +40,7 @@
 	then
 		case "$RELEASE" in
 			0.*|1.*|2.[0123].*)
-				update
+				/sbin/update
 			;;
 		esac
 	fi
@@ -75,7 +75,7 @@
 		  /dev/*)
 			;;
 		  LABEL=*|UUID=*)
-			if [ "$mnt" = "/" ] && which findfs >/dev/null 2>&1
+			if [ "$mnt" = "/" ] && which findfs >/dev/null
 			then
 				dev="$(findfs "$dev")"
 			fi
@@ -190,9 +190,9 @@
 
 	# See if we're on AC Power
 	# If not, we're not gonna run our check
-	if [ -x /usr/bin/on_ac_power ] && [ "$rootcheck" = yes ]
+	if which on_ac_power >/dev/null && [ "$rootcheck" = yes ]
 	then
-		/usr/bin/on_ac_power >/dev/null 2>&1
+		on_ac_power >/dev/null 2>&1
 		if [ "$?" -eq 1 ]
 		then
 			log_warning_msg "On battery power, so skipping file system check."

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/killprocs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/killprocs	2005-11-29 09:54:56 UTC (rev 329)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/killprocs	2005-11-29 10:07:26 UTC (rev 330)
@@ -27,7 +27,7 @@
 	then
 		case `uname -r` in
 		  0.*|1.*|2.[0123].*)
-			update
+			/sbin/update
 			;;
 		esac
 	fi

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-11-29 09:54:56 UTC (rev 329)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-11-29 10:07:26 UTC (rev 330)
@@ -146,9 +146,9 @@
 		:> /etc/mtab
 	fi
 	
-	if selinux_enabled && [ -x /sbin/restorecon ] && [ -r /etc/mtab ]
+	if selinux_enabled && which restorecon >/dev/null && [ -r /etc/mtab ]
 	then
-		/sbin/restorecon /etc/mtab
+		restorecon /etc/mtab
 	fi
 
 	domount proc "" /proc