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

[pere at alioth.debian.org]

Author: pere
Date: 2008-03-03 09:51:04 +0000 (Mon, 03 Mar 2008)
New Revision: 1255

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
  * Change init.d/rc to disable startpar concurrency if insserv isn't
    enabled and if startpar fail to run.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2008-03-02 10:30:47 UTC (rev 1254)
+++ sysvinit/trunk/debian/changelog	2008-03-03 09:51:04 UTC (rev 1255)
@@ -3,6 +3,8 @@
   * Use $(MAKE) instead of make in debian/rules, to make it easier to
     use make -j.
   * Adjust debian/rules to support cross building (Closes: #466148).
+  * Change init.d/rc to disable startpar concurrency if insserv isn't
+    enabled and if startpar fail to run.
 
  -- Petter Reinholdtsen <pere at localhost>  Sun, 02 Mar 2008 11:27:34 +0100
 

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2008-03-02 10:30:47 UTC (rev 1254)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2008-03-03 09:51:04 UTC (rev 1255)
@@ -98,10 +98,23 @@
 # the boot.  Bad!  See also bug #339955.
 #[ S = "$runlevel" ] && sh=.
 
-# startpar do not work properly at the start of rcS.d/.  Avoid it.
-# See #457896 for details.
-if [ S = "$runlevel" ] && [ startpar = "$CONCURRENCY" ] ; then
-    CONCURRENCY=none
+#
+# Check if we are able to use make like booting.  It require the
+# insserv package to be enabled.
+#
+if [ startpar = "$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"
+    type -p startpar &> /dev/null     || CONCURRENCY="none"
+    startpar -v      &> /dev/null     || CONCURRENCY="none"
+
+    # startpar do not work properly at the start of rcS.d/.  Avoid it.
+    # See #457896 for details.
+
+    if [ S = "$runlevel" ] ; then
+	CONCURRENCY=none
+    fi
 fi
 
 #