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

[Petter Reinholdtsen]

Author: pere
Date: 2010-03-20 10:01:00 +0000 (Sat, 20 Mar 2010)
New Revision: 1832

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/initscripts/etc/init.d/mountall.sh
Log:
Only send SIGUSR to init from init.d/mountall.sh when /dev/initctl
was created, to reduce the chance of confusing upstart (Related to
#569032).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-03-20 09:34:16 UTC (rev 1831)
+++ sysvinit/trunk/debian/changelog	2010-03-20 10:01:00 UTC (rev 1832)
@@ -6,6 +6,9 @@
     argument when called from /etc/init.d/rc (Closes: #505468).
   * Only use /proc/cmdline to override VERBOSE setting during boot if
     it is readable (Closes: #540008).
+  * Only send SIGUSR to init from init.d/mountall.sh when /dev/initctl
+    was created, to reduce the chance of confusing upstart (Related to
+    #569032).
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 25 Oct 2009 22:32:18 +0100
 

Modified: sysvinit/trunk/debian/src/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/src/initscripts/etc/init.d/mountall.sh	2010-03-20 09:34:16 UTC (rev 1831)
+++ sysvinit/trunk/debian/src/initscripts/etc/init.d/mountall.sh	2010-03-20 10:01:00 UTC (rev 1832)
@@ -59,8 +59,8 @@
 	then
 		rm -f $INITCTL
 		mknod -m 600 $INITCTL p
+		kill -USR1 1
 	fi
-	kill -USR1 1
 
 	#
 	# Execute swapon command again, in case we want to swap to