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

[Petter Reinholdtsen]

Author: pere
Date: 2009-06-23 16:02:17 +0000 (Tue, 23 Jun 2009)
New Revision: 1344

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
Drop shell style concurrent booting, and make CONCURRENCY=shell
behave like CONCURRENTY=startpar, as startpar concurrency now work
properly.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-06-23 15:59:19 UTC (rev 1343)
+++ sysvinit/trunk/debian/changelog	2009-06-23 16:02:17 UTC (rev 1344)
@@ -77,6 +77,9 @@
     from Tim Phipps.
   * Make sysv-rc depend on a version of sysvinit-utils with a properly
     working startpar, in case concurrent booting is enabled.
+  * Drop shell style concurrent booting, and make CONCURRENCY=shell
+    behave like CONCURRENTY=startpar, as startpar concurrency now work
+    properly.
 
  -- Kel Modderman <kel at otaku42.de>  Tue, 23 Jun 2009 20:40:49 +1000
 

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2009-06-23 15:59:19 UTC (rev 1343)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2009-06-23 16:02:17 UTC (rev 1344)
@@ -21,7 +21,7 @@
 # debug=echo
 
 # Specify method used to enable concurrent init.d scripts.
-# Valid options are 'none', 'shell', 'startpar' and 'makefile'. To enable
+# Valid options are 'none', 'startpar' and 'makefile'. To enable
 # the concurrent boot option, the init.d script order must allow for
 # concurrency.  This is not the case with the default boot sequence in
 # Debian as of 2008-01-20.  Before enabling concurrency, one need to
@@ -110,20 +110,7 @@
 # Start script or program.
 #
 case "$CONCURRENCY" in
-	shell)
-		log_action_msg "Using shell-style concurrent boot in runlevel $runlevel"
-		startup() {
-			action=$1
-			shift
-			scripts="$@"
-			for script in $scripts ; do
-				$debug "$script" $action &
-				startup_progress
-			done
-			wait
-		}
-		;;
-	startpar)
+	startpar|shell) # shell is obsolete
 		log_action_msg "Using startpar-style concurrent boot in runlevel $runlevel"
 		startup() {
 			action=$1