summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-03-28 12:50:25 +0000
committerRichard Purdie <richard@openedhand.com>2007-03-28 12:50:25 +0000
commit48fd3247f21eacfd901951858ed5700461cf9c11 (patch)
tree11ed871d7c07e229ea2c4af220472238cfdb4ba7 /meta/packages
parent2cf7809ae5e25b10d47dbc3ef94f96f4e15939e6 (diff)
downloadopenembedded-core-48fd3247f21eacfd901951858ed5700461cf9c11.tar.gz
openembedded-core-48fd3247f21eacfd901951858ed5700461cf9c11.tar.bz2
openembedded-core-48fd3247f21eacfd901951858ed5700461cf9c11.tar.xz
openembedded-core-48fd3247f21eacfd901951858ed5700461cf9c11.zip
sysvinit: Fix divide by zero upon shutdown
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1404 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rwxr-xr-xmeta/packages/sysvinit/sysvinit/rc7
-rw-r--r--meta/packages/sysvinit/sysvinit_2.86.bb2
2 files changed, 7 insertions, 2 deletions
diff --git a/meta/packages/sysvinit/sysvinit/rc b/meta/packages/sysvinit/sysvinit/rc
index cafd2301f..2abc818ee 100755
--- 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 1cfd0b701..97b611fe9 100644
--- 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.