Code: Select all
diff -Nru a/splash-functions.sh b/splash-functions.sh
--- a/splash-functions.sh 2005-03-16 11:34:55.764466624 +0100
+++ b/splash-functions.sh 2005-03-16 11:40:22.355817192 +0100
@@ -19,11 +19,11 @@
# values for spl_cachetype are 'tmpfs' and 'ramfs'. spl_cachesize
# is a size limit in KB, and it should probably be left with the
# default value.
-spl_cachedir="/var/cache/splash"
+spl_cachedir="/ubin/splash"
spl_cachesize="4096"
spl_cachetype="tmpfs"
-spl_fifo="/var/cache/splash/.splash"
-spl_pidfile="/var/cache/splash/daemon.pid"
+spl_fifo="${spl_cachedir}/.splash"
+spl_pidfile="${spl_cachedir}/daemon.pid"
# This is a little tricky. We need depscan.sh to create an updated cache for
# us, and we need it in our place ($spl_cachedir), and not in $svcdir, since th
e
@@ -196,7 +196,7 @@
if [[ ! -e ${spl_cachedir}/levels || \
! -e ${spl_cachedir}/svcs_start || \
"$(head -n1 ${spl_cachedir}/levels)" != "${BOOTLEVEL}/${DEFAULT
LEVEL}" || \
- "$(tail -n1 ${spl_cachedir}/levels)" != "$(stat -c '%y' /etc/ru
nlevels/${BOOTLEVEL})/$(stat -c '%y' /etc/runlevels/${DEFAULTLEVEL})" || \
+ "$(/ubin/tail -n1 ${spl_cachedir}/levels)" != "$(stat -c '%y' /
etc/runlevels/${BOOTLEVEL})/$(stat -c '%y' /etc/runlevels/${DEFAULTLEVEL})" || \
"$(stat -c '%y' ${spl_cachedir}/deptree)" != "${h}" ]]; then
echo $(splash_svclist_update "start") > ${spl_cachedir}/svcs_sta
rt
fi
@@ -461,7 +461,7 @@
}
splash_get_mode() {
- local ctty="$(fgconsole)"
+ local ctty="$(/ubin/fgconsole)"
if [[ ${ctty} == "${SPLASH_TTY}" ]]; then
echo "silent"Code: Select all
diff -Nru a/splash b/splash
--- a/splash 2005-03-16 11:48:10.249686512 +0100
+++ b/splash 2005-03-16 11:48:31.871399512 +0100
@@ -95,7 +95,7 @@
paint_progress
elif [ "$1" == "verbose" ]; then
if [[ "$(splash_get_mode)" == "silent" ]]; then
- /usr/bin/chvt 1
+ /ubin/chvt 1
fi
else
if [[ "$(splash_get_mode)" == "silent" ]]; thenCode: Select all
diff -Nru a/splash.h b/splash.h
--- a/splash.h 2005-03-16 12:09:22.773233528 +0100
+++ b/splash.h 2005-03-16 12:09:41.154439160 +0100
@@ -9,7 +9,7 @@
#define MAX_ICONS 512
#define SPLASH_DEV "/dev/fbsplash"
-#define SPLASH_FIFO "/var/cache/splash/.splash"
+#define SPLASH_FIFO "/ubin/splash/.splash"
#define TTY_SILENT 8
#define TTY_VERBOSE 1
Code: Select all
diff -Nru a/splash-functions.sh b/splash-functions.sh
--- a/splash-functions.sh 2005-03-16 21:49:45.211672528 +0100
+++ b/splash-functions.sh 2005-03-16 21:47:54.027575080 +0100
@@ -19,11 +19,11 @@
# values for spl_cachetype are 'tmpfs' and 'ramfs'. spl_cachesize
# is a size limit in KB, and it should probably be left with the
# default value.
-spl_cachedir="/var/cache/splash"
+spl_cachedir="/ubin/splash"
spl_cachesize="4096"
spl_cachetype="tmpfs"
-spl_fifo="/var/cache/splash/.splash"
-spl_pidfile="/var/cache/splash/daemon.pid"
+spl_fifo="${spl_cachedir}/.splash"
+spl_pidfile="${spl_cachedir}/daemon.pid"
# This is a little tricky. We need depscan.sh to create an updated cache for
# us, and we need it in our place ($spl_cachedir), and not in $svcdir, since the
@@ -196,7 +196,7 @@
if [[ ! -e ${spl_cachedir}/levels || \
! -e ${spl_cachedir}/svcs_start || \
"$(head -n1 ${spl_cachedir}/levels)" != "${BOOTLEVEL}/${DEFAULTLEVEL}" || \
- "$(tail -n1 ${spl_cachedir}/levels)" != "$(stat -c '%y' /etc/runlevels/${BOOTLEVEL})/$(stat -c '%y' /etc/runlevels/${DEFAULTLEVEL})" || \
+ "$(/ubin/tail -n1 ${spl_cachedir}/levels)" != "$(stat -c '%y' /etc/runlevels/${BOOTLEVEL})/$(stat -c '%y' /etc/runlevels/${DEFAULTLEVEL})" || \
"$(stat -c '%y' ${spl_cachedir}/deptree)" != "${h}" ]]; then
echo $(splash_svclist_update "start") > ${spl_cachedir}/svcs_start
fi
@@ -355,7 +355,7 @@
}
as="$(autoconfig_svcs)"
- ss="$(dolisting "/etc/runlevels/${SOFTLEVEL}/") "
+ [[ -n "${SOFTLEVEL}" ]] && ss="$(dolisting "/etc/runlevels/${SOFTLEVEL}/") "
sb="$(dolisting "/etc/runlevels/${BOOTLEVEL}/") "
sd="$(dolisting "/etc/runlevels/${DEFAULTLEVEL}/") "
@@ -461,7 +461,7 @@
}
splash_get_mode() {
- local ctty="$(fgconsole)"
+ local ctty="$(/ubin/fgconsole)"
if [[ ${ctty} == "${SPLASH_TTY}" ]]; then
echo "silent"Code: Select all
title=Gentoo Linux 2.6.11 FBSplash
root (hd0,0)
kernel /vmlinuz-2.6.11 root=/dev/hda2 video=vesafb:1024x768-16@75 resume2=swap:/dev/hda3 splash=silent,theme:emergence,console=tty1 quiet
initrd /fbsplash-emergence-1024x768

Code: Select all
kernel /vmlinuz ro root=/dev/hda3 video=vesafb:1024x768-24@75 resume2=swap:/dev/hda2 splash=silent,fadein,tty:8,theme:emergence quiet CONSOLE=/dev/tty1Code: Select all
# Config file for splashutils
# a theme to use, probably best left commented (the theme specified
# on the kernel command line is used)
# SPLASH_THEME="gentoo"
# on which ttys should fbsplash be enabled? defaults to RC_TTY_NUMBER
SPLASH_TTYS="0 1 2 3 4 5 6 7 8"
# what font to use? defaults to what fbtruetype uses
# SPLASH_FONT="luxisri.ttf"
# boot/reboot/shutdown message overrides
# SPLASH_BOOT_MESSAGE="Booting the system"
# SPLASH_REBOOT_MESSAGE="Rebooting the system"
# SPLASH_SHUTDOWN_MESSAGE="Shutting the system down"
# should we drop to verbose mode on initscript errors? (yes/no)
SPLASH_VERBOSE_ON_ERRORS="no"
# allows to set different themes on different consoles
# format: "<console>:<theme> <console>:<theme> (...)"
SPLASH_TTY_MAP="1:emergence 2:emergence 3:emergence 4:emergence 5:emergence 6:emergence 7:emergence 8:emergence"