From 212e36417ae27e1be11147168b6f5cdfd1c5eda9 Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman" <raster@rasterman.com>
Date: Fri, 17 Apr 2009 15:44:58 +1000
Subject: angstrom, exquisite, psplash, opkg, angsrtom-images, sysvinit:
 abstract splash

this abstracts psplash to be generic. now as long as something provides a
splashfuncs file that sysvinit (and other scripts) can source, and all the
approproate init hooks to start the splash etc. you can use psplash,
exquisitie, usplash or anything that tickles your fancy. this moves splash
toa ${SPLASH} variable to include in your image (or override). the default in
angstrom is psplash - unless you override it. opkg also runs a configure
script that cna take forever - and so this speically sends off some splash
commands (if there) to let you know the systme is alive and working (but just
busy).

this is one commit as if this breaks things you either want to fix the minor
break or totally revert the whole patch. i hope it didn't break anything.
---
 recipes/sysvinit/sysvinit/angstrom/rc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'recipes/sysvinit/sysvinit')

diff --git a/recipes/sysvinit/sysvinit/angstrom/rc b/recipes/sysvinit/sysvinit/angstrom/rc
index 30b69ad516..6c5f4ca2ec 100755
--- a/recipes/sysvinit/sysvinit/angstrom/rc
+++ b/recipes/sysvinit/sysvinit/angstrom/rc
@@ -16,6 +16,9 @@
 #
 
 . /etc/default/rcS
+if [ -f /etc/default/splashfuncs ]; then
+    . /etc/default/splashfuncs
+fi
 export VERBOSE
 
 startup_progress() {
@@ -26,9 +29,7 @@ startup_progress() {
         progress=$progress_size
     fi
     #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size"
-    if type psplash-write >/dev/null 2>&1; then
-        TMPDIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true
-    fi
+    status_position $progress || true
 }
 
 
@@ -169,8 +170,8 @@ startup() {
 
 #Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch
 #if [ "x$runlevel" != "xS" ]; then
-#    if type psplash-write >/dev/null 2>&1; then
-#        TMPDIR=/mnt/.psplash psplash-write "QUIT" || true
-#    	umount /mnt/.psplash
+#    if type splash-write >/dev/null 2>&1; then
+#        TMPDIR=/mnt/.splash splash-write "QUIT" || true
+#    	umount /mnt/.splash
 #    fi
 #fi
-- 
cgit 1.2.3-korg