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

[Petter Reinholdtsen]

Author: pere
Date: 2010-03-21 18:50:31 +0000 (Sun, 21 Mar 2010)
New Revision: 1846

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/initscripts/etc/init.d/mountall.sh
Log:
Only create /dev/initctl and send SIGUSR to init in
init.d/mountall.sh when sysvinit is installed (Closes: #569032).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-03-21 18:40:07 UTC (rev 1845)
+++ sysvinit/trunk/debian/changelog	2010-03-21 18:50:31 UTC (rev 1846)
@@ -10,6 +10,8 @@
     execution (Closes: #566783).  Patch from Per Wawra.
   * Correct use of .IB and .IR macros in update-rc.d manual page
     (Closes: 556080).  Patch from Matt Kraai.
+  * Only create /dev/initctl and send SIGUSR to init in
+    init.d/mountall.sh when sysvinit is installed (Closes: #569032).
 
   [ Kel Modderman ]
   * Exit with value rather than echo the value for the status action in

Modified: sysvinit/trunk/debian/src/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/src/initscripts/etc/init.d/mountall.sh	2010-03-21 18:40:07 UTC (rev 1845)
+++ sysvinit/trunk/debian/src/initscripts/etc/init.d/mountall.sh	2010-03-21 18:50:31 UTC (rev 1846)
@@ -54,10 +54,10 @@
 
 	#
 	# We might have mounted something over /dev, see if
-	# /dev/initctl is there.
+	# /dev/initctl is there.  Look for /usr/share/sysvinit/update-rc.d
+	# to verify that sysvinit (and not upstart) is installed).
 	#
-	if [ ! -p $INITCTL ]
-	then
+	if [ ! -p $INITCTL ] && [ -f /usr/share/sysvinit/update-rc.d ]; then
 		rm -f $INITCTL
 		mknod -m 600 $INITCTL p
 		kill -USR1 1