diff options
| author | James Meyer <james.meyer@operamail.com> | 2010-09-26 01:12:31 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2010-09-26 01:12:31 (GMT) |
| commit | 3a0e257f6d84b473151464699f6ea17d9b350d4c (patch) | |
| tree | ea0d04783f3cc50c5a30db207388bbf639e70e6a /abs/core-testing/runit-scripts/fbsplash-runit.sh | |
| parent | 51b45f3affe52c67253a5adbaf5c15e6b7a61889 (diff) | |
| download | linhes_pkgbuild-3a0e257f6d84b473151464699f6ea17d9b350d4c.zip linhes_pkgbuild-3a0e257f6d84b473151464699f6ea17d9b350d4c.tar.gz linhes_pkgbuild-3a0e257f6d84b473151464699f6ea17d9b350d4c.tar.bz2 | |
runit-scripts: update tty2/3 to use tty2 and tty3 instead of vc/2
added logic around fbsplash-runit to stop it from aborting when fb-slash.conf is missing
Diffstat (limited to 'abs/core-testing/runit-scripts/fbsplash-runit.sh')
| -rwxr-xr-x | abs/core-testing/runit-scripts/fbsplash-runit.sh | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/abs/core-testing/runit-scripts/fbsplash-runit.sh b/abs/core-testing/runit-scripts/fbsplash-runit.sh index aa391b0..fb132b8 100755 --- a/abs/core-testing/runit-scripts/fbsplash-runit.sh +++ b/abs/core-testing/runit-scripts/fbsplash-runit.sh @@ -5,23 +5,26 @@ CALLER=$0 # splash stuff # -. /etc/conf.d/fbsplash.conf -. /sbin/splash-functions.sh +if [ -e /etc/conf.d/fbsplash.conf ] +then + . /etc/conf.d/fbsplash.conf + . /sbin/splash-functions.sh # Redefine the stat functions # -stat_runit() { - printf "${C_OTHER}${PREFIX_REG} ${C_MAIN}${1}${C_CLEAR} " - printf "${SAVE_POSITION}" - deltext - printf " ${C_OTHER}[${C_BUSY}BKGD${C_OTHER}]${C_CLEAR} " - # Load variables # - var_load STEP_NR MAX_STEPS RC_MULTI RC_SYSINIT RC_SHUTDOWN - # Only update the splash progress if we're in sysinit, multi, or shutdown. # - ((SPLASH_STEP_NR++)) - SPLASH_PROGRESS=$((100*${SPLASH_STEP_NR}/${SPLASH_MAX_STEPS})) - SPLASH_CURRENT_PROGRESS=${SPLASH_PROGRESS} - splash_update_progress ${SPLASH_PROGRESS} - var_save STEP_NR CURRENT_PROGRESS + stat_runit() { + printf "${C_OTHER}${PREFIX_REG} ${C_MAIN}${1}${C_CLEAR} " + printf "${SAVE_POSITION}" + deltext + printf " ${C_OTHER}[${C_BUSY}BKGD${C_OTHER}]${C_CLEAR} " + # Load variables # + var_load STEP_NR MAX_STEPS RC_MULTI RC_SYSINIT RC_SHUTDOWN + # Only update the splash progress if we're in sysinit, multi, or shutdown. # + ((SPLASH_STEP_NR++)) + SPLASH_PROGRESS=$((100*${SPLASH_STEP_NR}/${SPLASH_MAX_STEPS})) + SPLASH_CURRENT_PROGRESS=${SPLASH_PROGRESS} + splash_update_progress ${SPLASH_PROGRESS} + var_save STEP_NR CURRENT_PROGRESS -} + } +fi |