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

[pere at alioth.debian.org]

Author: pere
Date: 2007-12-27 15:39:44 +0000 (Thu, 27 Dec 2007)
New Revision: 1139

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
  * Avoid using startpar for rcS.d/.  It does not work properly.
    Related to bug #457896.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2007-12-27 15:37:19 UTC (rev 1138)
+++ sysvinit/trunk/debian/changelog	2007-12-27 15:39:44 UTC (rev 1139)
@@ -2,6 +2,8 @@
 
   * Replace log_daemon_msg() in init.d/rc with log_action_msg() to
     improve visual layout when parallel booting is enabled.
+  * Avoid using startpar for rcS.d/.  It does not work properly.
+    Related to bug #457896.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 27 Dec 2007 16:36:56 +0100
 

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2007-12-27 15:37:19 UTC (rev 1138)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2007-12-27 15:39:44 UTC (rev 1139)
@@ -87,6 +87,12 @@
 # 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
+fi
+
 #
 # Start script or program.
 #