sysvinit: Fix divide by zero upon shutdown

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1404 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/sysvinit/sysvinit/rc b/meta/packages/sysvinit/sysvinit/rc
index cafd230..2abc818 100755 (executable)
--- a/meta/packages/sysvinit/sysvinit/rc
+++ b/meta/packages/sysvinit/sysvinit/rc
@@ -20,7 +20,12 @@ export VERBOSE
 
 startup_progress() {
     step=$(($step + $step_change))
-    progress=$(($step * $progress_size / $num_steps + $first_step))
+    denominator=$(($num_steps + $first_step))
+    if [ "$denominator" != "0" ]; then
+        progress=$(($step * $progress_size / $denominator))
+    else
+        progress=$progress_size
+    fi
     if type psplash-write >/dev/null 2>&1; then
         TMPDIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true
     fi

diff --git a/meta/packages/sysvinit/sysvinit_2.86.bb b/meta/packages/sysvinit/sysvinit_2.86.bb
index 1cfd0b7..97b611f 100644 (file)
--- a/meta/packages/sysvinit/sysvinit_2.86.bb
+++ b/meta/packages/sysvinit/sysvinit_2.86.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init."
 SECTION = "base"
 LICENSE = "GPL"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r26"
+PR = "r27"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.