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

[pere at alioth.debian.org]

Author: pere
Date: 2007-12-27 16:18:38 +0000 (Thu, 27 Dec 2007)
New Revision: 1140

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
  * Correct init.d/rc progress bar calculations for the startpar
    option.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2007-12-27 15:39:44 UTC (rev 1139)
+++ sysvinit/trunk/debian/changelog	2007-12-27 16:18:38 UTC (rev 1140)
@@ -4,6 +4,8 @@
     improve visual layout when parallel booting is enabled.
   * Avoid using startpar for rcS.d/.  It does not work properly.
     Related to bug #457896.
+  * Correct init.d/rc progress bar calculations for the startpar
+    option.
 
  -- 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:39:44 UTC (rev 1139)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2007-12-27 16:18:38 UTC (rev 1140)
@@ -144,14 +144,19 @@
 					set -- "$action"
 					$debug . "$script"
 					PATH="$RC_SAVE_PATH"
-					startup_progress
 					;;
 				  *)
 					newscripts="$newscripts $script"
 					;;
 				esac
+				startup_progress
 			done
 			scripts="$newscripts"
+		else
+			# Update progress bar for each 
+			for script in $scripts ; do
+				startup_progress
+			done
 		fi
 
 		# startpar is not able to handle time jumps.  So the
@@ -159,7 +164,6 @@
 		# within startpar.  The .sh hack above make this
 		# problem irrelevant. [pere 2005-09-10]
 		[ -n "$scripts" ] && $debug startpar -a $action $scripts
-		startup_progress
 	}
 	;;
   none|*)