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

[pere at alioth.debian.org]

Author: pere
Date: 2008-02-01 06:43:03 +0000 (Fri, 01 Feb 2008)
New Revision: 1237

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
  * Change progress bar calculations to not divide by zero when there
    are no progress steps to be taken (Closes: #463504).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2008-01-24 22:18:41 UTC (rev 1236)
+++ sysvinit/trunk/debian/changelog	2008-02-01 06:43:03 UTC (rev 1237)
@@ -3,6 +3,8 @@
   * Correct file name in output when removing conffiles, to
     use the correct file ending .dpkg-old, not .dpkg-bak.
   * Fix typo in omitpid handling in init.d/sendsigs (Closes: #462354)
+  * Change progress bar calculations to not divide by zero when there
+    are no progress steps to be taken (Closes: #463504).
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 23 Jan 2008 14:04:18 +0100
 

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2008-01-24 22:18:41 UTC (rev 1236)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2008-02-01 06:43:03 UTC (rev 1237)
@@ -83,6 +83,9 @@
 # Stub to do progress bar ticks (for splash programs) on startup
 #
 startup_progress() {
+    # Avoid divide by zero if anyone moved xdm/kdm/gdm first in a runlevel.
+    if [ 0 = "$num_steps" ] ; then return; fi
+
     step=$(($step + $step_change))
     progress=$(($step * $progress_size / $num_steps + $first_step))
     $debug splash_progress "$progress" || true