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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-12-31 13:06:19 +0000 (Sat, 31 Dec 2005)
New Revision: 471

Modified:
   sysvinit/trunk/debian/changelog
   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/checkfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
   sysvinit/trunk/debian/initscripts/lib/init/functions.sh
Log:
Fix #345321

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-12-31 12:50:15 UTC (rev 470)
+++ sysvinit/trunk/debian/changelog	2005-12-31 13:06:19 UTC (rev 471)
@@ -1,4 +1,4 @@
-sysvinit (2.86.ds1-9~3) unstable; urgency=low
+sysvinit (2.86.ds1-9~4) unstable; urgency=low
 
   [ Thomas Hood ]
   * initscripts: Clean up code that reads fstab
@@ -9,6 +9,9 @@
   * init: 64_init_set_PATH: Set PATH if unset on reload
     (Closes: #345370)
   * Remount ro with -f on GNU/kFreeBSD  (Closes: #344547)
+  * Redirect which program's stderr to /dev/null since the GNU version
+    prints an error message when the command is not found
+    (Closes: #345321)
 
   [ Petter Reinholdtsen ]
   * sysv-rc: Fix some typos in the startpar handling.  (Closes: #345269)

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh	2005-12-31 12:50:15 UTC (rev 470)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh	2005-12-31 13:06:19 UTC (rev 471)
@@ -106,8 +106,8 @@
 }
 
 bootclean() {
-	which find >/dev/null || return 0
-	which xargs >/dev/null || return 0
+	which find >/dev/null 2>&1 || return 0
+	which xargs >/dev/null 2>&1 || return 0
 
 	# If there are /tmp/.clean files that have not been created by root
 	# then remove them
@@ -115,7 +115,7 @@
 	do
 		if [ -f $cleandir/.clean ]
 		then
-			which stat >/dev/null && cleanuid="$(stat -c %u $cleandir/.clean)"
+			which stat >/dev/null 2>&1 && 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="$(find $cleandir/.clean -printf %U)"

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2005-12-31 12:50:15 UTC (rev 470)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2005-12-31 13:06:19 UTC (rev 471)
@@ -43,7 +43,7 @@
 	[ -f /etc/motd.tail ] && cat /etc/motd.tail >> /var/run/motd
 
 	# Save kernel messages in /var/log/dmesg
-	if which dmesg >/dev/null
+	if which dmesg >/dev/null 2>&1
 	then
 		savelog -q -p -c 5 /var/log/dmesg
 		dmesg -s 524288 > /var/log/dmesg

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2005-12-31 12:50:15 UTC (rev 470)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2005-12-31 13:06:19 UTC (rev 471)
@@ -20,7 +20,7 @@
 do_start () {
 	# See if we're on AC Power
 	# If not, we're not gonna run our check
-	if which on_ac_power >/dev/null
+	if which on_ac_power >/dev/null 2>&1
 	then
 		on_ac_power >/dev/null 2>&1
 		if [ $? -eq 1 ]

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-12-31 12:50:15 UTC (rev 470)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-12-31 13:06:19 UTC (rev 471)
@@ -77,7 +77,7 @@
 		  /dev/*)
 			;;
 		  LABEL=*|UUID=*)
-			if [ "$MTPT" = "/" ] && which findfs >/dev/null
+			if [ "$MTPT" = "/" ] && which findfs >/dev/null 2>&1
 			then
 				DEV="$(findfs "$DEV")"
 			fi
@@ -193,7 +193,7 @@
 
 	# See if we're on AC Power
 	# If not, we're not gonna run our check
-	if which on_ac_power >/dev/null && [ "$rootcheck" = yes ]
+	if which on_ac_power >/dev/null 2>&1 && [ "$rootcheck" = yes ]
 	then
 		on_ac_power >/dev/null 2>&1
 		if [ "$?" -eq 1 ]

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-12-31 12:50:15 UTC (rev 470)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-12-31 13:06:19 UTC (rev 471)
@@ -155,7 +155,7 @@
 	then
 		:> /etc/mtab
 	fi
-	if selinux_enabled && which restorecon >/dev/null && [ -r /etc/mtab ]
+	if selinux_enabled && which restorecon >/dev/null 2>&1 && [ -r /etc/mtab ]
 	then
 		restorecon /etc/mtab
 	fi

Modified: sysvinit/trunk/debian/initscripts/lib/init/functions.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/lib/init/functions.sh	2005-12-31 12:50:15 UTC (rev 470)
+++ sysvinit/trunk/debian/initscripts/lib/init/functions.sh	2005-12-31 13:06:19 UTC (rev 471)
@@ -16,5 +16,5 @@
 }
 
 selinux_enabled () {
-	which selinuxenabled >/dev/null && selinuxenabled
+	which selinuxenabled >/dev/null 2>&1 && selinuxenabled
 }