[oe-commits] Koen Kooi : sysvinit: only ping splash when splashfuncs are present
GIT User account
git at amethyst.openembedded.net
Fri Apr 17 16:52:54 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 54c2f02920fde00de5f9d260173b6bbe1de8426a
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=54c2f02920fde00de5f9d260173b6bbe1de8426a
Author: Koen Kooi <koen at openembedded.org>
Date: Fri Apr 17 18:48:25 2009 +0200
sysvinit: only ping splash when splashfuncs are present
---
recipes/sysvinit/sysvinit/angstrom/rc | 19 +++++++++++--------
recipes/sysvinit/sysvinit_2.86.bb | 2 +-
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/recipes/sysvinit/sysvinit/angstrom/rc b/recipes/sysvinit/sysvinit/angstrom/rc
index 6c5f4ca..d1798ed 100755
--- a/recipes/sysvinit/sysvinit/angstrom/rc
+++ b/recipes/sysvinit/sysvinit/angstrom/rc
@@ -18,18 +18,21 @@
. /etc/default/rcS
if [ -f /etc/default/splashfuncs ]; then
. /etc/default/splashfuncs
+ export SPLASH="1"
fi
export VERBOSE
startup_progress() {
- step=$(($step + $step_change))
- if [ "$num_steps" != "0" ]; then
- progress=$((($step * $progress_size / $num_steps) + $first_step))
- else
- progress=$progress_size
- fi
- #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size"
- status_position $progress || true
+ if [ "$SPLASH" = "1" ] ; then
+ step=$(($step + $step_change))
+ if [ "$num_steps" != "0" ] ; then
+ progress=$((($step * $progress_size / $num_steps) + $first_step))
+ else
+ progress=$progress_size
+ fi
+ #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size"
+ status_position $progress || true
+ fi
}
diff --git a/recipes/sysvinit/sysvinit_2.86.bb b/recipes/sysvinit/sysvinit_2.86.bb
index d3a1517..e65391a 100644
--- a/recipes/sysvinit/sysvinit_2.86.bb
+++ b/recipes/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 = "r52"
+PR = "r53"
# USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
# Set PACKAGE_ARCH appropriately.
More information about the Openembedded-commits
mailing list