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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-10 18:44:49 +0000 (Tue, 10 Jan 2006)
New Revision: 572

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
Backport progress bar related change from ubuntu 2.86.ds1-6ubuntu1

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-01-10 18:30:57 UTC (rev 571)
+++ sysvinit/trunk/debian/changelog	2006-01-10 18:44:49 UTC (rev 572)
@@ -1,4 +1,4 @@
-sysvinit (2.86.ds1-10~5) unstable; urgency=low 
+sysvinit (2.86.ds1-10~6) unstable; urgency=low 
 
   [ Thomas Hood ]
   * rcS(5): Reword
@@ -9,6 +9,7 @@
     + Use ':', not the deprecated '.' between owner and group names
       in chown commands
     + Use '-o root' with install
+  * During shutdown and reboot take the progress bar from 100 to 0.
 
  -- Thomas Hood <jdthood at yahoo.co.uk>  Mon,  9 Jan 2006 14:16:02 +0100
 

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2006-01-10 18:30:57 UTC (rev 571)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2006-01-10 18:44:49 UTC (rev 572)
@@ -190,15 +190,21 @@
 	case "$runlevel" in
 	  0|6)
 		ACTION=stop
-		first_step=0
+		first_step=100
+		progress_size=100
+		step_change=-1
 		;;
 	  S)
 		ACTION=start
 		first_step=0
+		progress_size=100
+		step_change=1
 		;;
 	  *)
 		ACTION=start
-		first_step=50
+		first_step=0
+		progress_size=100
+		step_change=1
 		;;
 	esac
 
@@ -252,8 +258,8 @@
 
 		# Use 50% of the progress bar for rcS and the rest for the
 		# runlevel we want to end up in
-		step=$(($step + 1))
-		progress=$(($step * 50 / $num_steps + $first_step))
+		step=$(($step + $step_change))
+		progress=$(($step * $progress_size / $num_steps + $first_step))
 		if type usplash_write >/dev/null 2>&1; then
 			usplash_write "PROGRESS $progress" || true
 		fi
@@ -278,4 +284,6 @@
 fi
 
 trap - EXIT # Disable emergency handler
-exit 0 # Exit normally
+
+exit 0
+