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

[Petter Reinholdtsen]

Author: pere
Date: 2010-05-29 22:16:02 +0000 (Sat, 29 May 2010)
New Revision: 1910

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/initscripts/etc/init.d/sendsigs
Log:
Protect new code calling initctl in sendsigs to only run when
/sbin/initctl is available.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-05-29 19:10:39 UTC (rev 1909)
+++ sysvinit/trunk/debian/changelog	2010-05-29 22:16:02 UTC (rev 1910)
@@ -1,3 +1,11 @@
+sysvinit (2.88dsf-7) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Protect new code calling initctl in sendsigs to only run when
+    /sbin/initctl is available.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sun, 30 May 2010 00:15:27 +0200
+
 sysvinit (2.88dsf-6) unstable; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: sysvinit/trunk/debian/src/initscripts/etc/init.d/sendsigs
===================================================================
--- sysvinit/trunk/debian/src/initscripts/etc/init.d/sendsigs	2010-05-29 19:10:39 UTC (rev 1909)
+++ sysvinit/trunk/debian/src/initscripts/etc/init.d/sendsigs	2010-05-29 22:16:02 UTC (rev 1910)
@@ -81,10 +81,11 @@
 		# again on each loop and add any new jobs (e.g., plymouth) to
 		# the list.  If we did miss one starting up, this beats waiting
 		# 10 seconds before shutting down.
-		for pid in $(initctl list | sed -n -e "/process [0-9]/s/.*process //p"); do
+		if [ -x /sbin/initctl ]; then
+		    for pid in $(initctl list | sed -n -e "/process [0-9]/s/.*process //p"); do
 			OMITPIDS="${OMITPIDS:+$OMITPIDS }-o $pid"
-		done
-
+		    done
+		fi
 		if killall5 -18 $OMITPIDS ; then
 		    :
 		else