[Pkg-sysvinit-commits] r1691 - in sysvinit/trunk/debian: . sysv-rc/etc/init.d

[Kel Modderman]

Author: kelmo-guest
Date: 2009-09-01 16:02:32 +0000 (Tue, 01 Sep 2009)
New Revision: 1691

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
Make sure sysv-rc/etc/init.d/rc checks insserv has reordered boot
system by checking for /etc/init.d/.depend.* when CONCURRENCY=shell
too.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-09-01 15:17:52 UTC (rev 1690)
+++ sysvinit/trunk/debian/changelog	2009-09-01 16:02:32 UTC (rev 1691)
@@ -60,6 +60,9 @@
   * Update inittab.kfreebsd-gnu: On GNU/kFreeBSD the serial devices have
     change from /dev/cuuaX to  /dev/ttydX in kernel 6.0 which is minumum
     kernel currently supported in Debian. (Closes: #544555)
+  * Make sure sysv-rc/etc/init.d/rc checks insserv has reordered boot
+    system by checking for /etc/init.d/.depend.* when CONCURRENCY=shell
+    too.
 
   [ Petter Reinholdtsen ]
   * Adjust init.d/bootlogd dependencies to start before hostname,
@@ -96,7 +99,7 @@
     though removing initscripts will leave the system unbootable.
     Update lintian overrides to reflect this.
 
- -- Kel Modderman <kel at otaku42.de>  Tue, 01 Sep 2009 23:53:09 +1000
+ -- Kel Modderman <kel at otaku42.de>  Wed, 02 Sep 2009 02:02:10 +1000
 
 sysvinit (2.87dsf-2) unstable; urgency=low
 

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2009-09-01 15:17:52 UTC (rev 1690)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2009-09-01 16:02:32 UTC (rev 1691)
@@ -99,9 +99,10 @@
 
 #
 # Check if we are able to use make like booting.  It require the
-# insserv package to be enabled.
+# insserv package to be enabled. Make-like concurrency requires
+# startpar to be installed.
 #
-if [ startpar = "$CONCURRENCY" ] || [ makefile = "$CONCURRENCY" ] ; then
+if [ "$CONCURRENCY" ] ; then
 	test -s /etc/init.d/.depend.boot  || CONCURRENCY="none"
 	test -s /etc/init.d/.depend.start || CONCURRENCY="none"
 	test -s /etc/init.d/.depend.stop  || CONCURRENCY="none"