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

[Petter Reinholdtsen]

Author: pere
Date: 2010-05-12 11:09:53 +0000 (Wed, 12 May 2010)
New Revision: 1889

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/sysv-rc/etc/init.d/rc
Log:
Switch to concurrent booting by default, when dependency based
boot sqeuencing is enabled.  Make shell and startpar concurrency
aliases for makefile style concurrency, as both are obsolete now.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-05-05 05:31:59 UTC (rev 1888)
+++ sysvinit/trunk/debian/changelog	2010-05-12 11:09:53 UTC (rev 1889)
@@ -3,6 +3,9 @@
   * New 30_killall5_hurd.patch to fix build problem on Hurd.  Patch
     from Werner Fink.
   * Fix typo in invoke-rc.d (Closes: #580298).
+  * Switch to concurrent booting by default, when dependency based
+    boot sqeuencing is enabled.  Make shell and startpar concurrency
+    aliases for makefile style concurrency, as both are obsolete now.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 28 Apr 2010 19:37:54 +0200
 

Modified: sysvinit/trunk/debian/src/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/src/sysv-rc/etc/init.d/rc	2010-05-05 05:31:59 UTC (rev 1888)
+++ sysvinit/trunk/debian/src/sysv-rc/etc/init.d/rc	2010-05-12 11:09:53 UTC (rev 1889)
@@ -30,7 +30,7 @@
 # number, and that a scripts dependencies have a earlier sequence
 # number. See the insserv package for a away to reorder the boot
 # automatically to allow this.
-CONCURRENCY=none
+CONCURRENCY=makefile
 
 # Make sure the name survive changing the argument list
 scriptname="$0"
@@ -113,29 +113,10 @@
 # Start script or program.
 #
 case "$CONCURRENCY" in
-	startpar|shell) # shell is obsolete
-		log_action_msg "Using startpar-style concurrent boot in runlevel $runlevel"
-		startup() {
-			action=$1
-			shift
-			scripts="$@"
-
-			# Update progress bar counter and jump to the new position
-			for script in $scripts ; do
-				step=$(($step + $step_change))
-			done
-
-			[ -n "$scripts" ] && $debug startpar -a $action $scripts
-
-			# Jump back one step to compencate for stepping one
-			# time too many in the for loop.
-			step=$(($step - $step_change))
-			startup_progress
-		}
-		;;
-	makefile)
+	makefile|startpar|shell) # startpar and shell are obsolete
 		log_action_msg "Using makefile-style concurrent boot in runlevel $runlevel"
-		# The splash API is not handled with this CONCURRENCY mode
+		# The splash API is not handled with this CONCURRENCY mode.
+		# It need to be implented in startpar.
 		startup() {
 			eval "$(startpar -p 4 -t 20 -T 3 -M $1 -P $previous -R $runlevel)"