diff options
| author | Britney Fransen <brfransen@gmail.com> | 2011-10-06 22:02:37 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2011-10-06 22:02:37 (GMT) |
| commit | fc7b12c545c7ecf66df1e7113f59dcf2fea0c2de (patch) | |
| tree | df08404833f54370bae5f2a6f5aa6d3583208963 | |
| parent | 81f6e0d44f1f03250fbda0217bfaba88fe55ac3f (diff) | |
| download | linhes_pkgbuild-fc7b12c545c7ecf66df1e7113f59dcf2fea0c2de.zip linhes_pkgbuild-fc7b12c545c7ecf66df1e7113f59dcf2fea0c2de.tar.gz linhes_pkgbuild-fc7b12c545c7ecf66df1e7113f59dcf2fea0c2de.tar.bz2 | |
runit-scripts: fbsplash-runit.sh: update for new fbsplash
| -rwxr-xr-x | abs/core/runit-scripts/PKGBUILD | 4 | ||||
| -rwxr-xr-x | abs/core/runit-scripts/fbsplash-runit.sh | 55 |
2 files changed, 26 insertions, 33 deletions
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index ee88800..c505356 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=2.1.1 -pkgrel=33 +pkgrel=34 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" @@ -27,4 +27,4 @@ build() { install -m0755 reboot-runit halt-runit logger $startdir/pkg/sbin rsync -a --exclude=.svn services/* $startdir/pkg/etc/sv } -md5sums=('45d0b0c6ad9b00eeaaef3341245a8d4c') +md5sums=('c79246677d5ffe687bcf6df1b9c2abc2') diff --git a/abs/core/runit-scripts/fbsplash-runit.sh b/abs/core/runit-scripts/fbsplash-runit.sh index a9432d0..87435ee 100755 --- a/abs/core/runit-scripts/fbsplash-runit.sh +++ b/abs/core/runit-scripts/fbsplash-runit.sh @@ -1,44 +1,37 @@ -# fbsplash function.d script # -# Author: Greg Helton <gt@fallendusk.org> # +# fbsplash functions.d runit script # -# Who is calling? # -CALLER=$0 printhlr() { printf "${C_OTHER}${PREFIX_REG} ${C_H1}${1}${C_CLEAR} \n" } +stat_runit(){ + printf "" + printhlr "${C_MAIN}${1}${C_CLEAR} " +} + + # splash stuff # -if [ -e /etc/conf.d/fbsplash.conf ] +if [ -e /etc/conf.d/fbcondecor ] then - . /etc/conf.d/fbsplash.conf + . /etc/conf.d/fbcondecor . /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} "a - - printf "" - printhlr "${C_MAIN}${1}${C_CLEAR} " - - # Load variables # + case $0 in /etc/runit/1 ) + # Prevent splash destruction + CONSOLEFONT="" + # Continue to use a splash daemon started in initcpio + if /bin/mountpoint -q /run/.splash-cache; then + /bin/mount --move /run/.splash-cache $spl_cachedir || return + # Mount a tmpfs + else + ( splash_cache_prep ) || return + fi - 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_comm_send set message "$SPLASH_BOOT_MESSAGE" - ((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 + ;; /etc/runit/3 ) + ( splash_cache_prep ) || return - } -else - stat_runit(){ - printf "" - printhlr "${C_MAIN}${1}${C_CLEAR} " - } + splash_comm_send set message "$SPLASH_SHUTDOWN_MESSAGE" + esac fi |