[patch] splash-function.sh for baselayout 1

splash-functions-bl1.sh.diff (text/plain), 4.45 KB, created by Jimmy.Jazz on 2007-08-17 18:35:04 UTC

--- ./splashutils-gentoo-1.0.5/splash-functions-bl1.sh	2007-08-17 19:41:35.000000000 +0200
+++ /sbin/splash-functions.sh	2007-08-17 19:46:53.000000000 +0200
@@ -22,9 +22,10 @@
 # is a size limit in KB, and it should probably be left with the
 # default value.
 spl_daemon="/sbin/fbsplashd.static"
-spl_bindir="/lib/splash/bin"
-spl_cachedir="/lib/splash/cache"
-spl_tmpdir="/lib/splash/tmp"
+spl_util="/bin/splash_util.static"
+spl_bindir="/lib64/splash/bin"
+spl_cachedir="/lib64/splash/cache"
+spl_tmpdir="/lib64/splash/tmp"
 spl_cachesize="4096"
 spl_cachetype="tmpfs"
 spl_fifo="${spl_cachedir}/.splash"
@@ -206,16 +207,16 @@
 	# Make sure the splash daemon is really dead (just in case the killall
 	# in splash_cache_cleanup didn't get executed). This should fix Gentoo
 	# bug #96697.
-	killall -9 fbsplashd.static >/dev/null 2>/dev/null
+	killall -9 ${spl_daemon##*/} 2>/dev/null
 	rm -f "${spl_pidfile}"
 }
 
-splash_start() {
+splash_start() { 
 	# Prepare the communications FIFO
 	rm -f ${spl_fifo} 2>/dev/null
 
 	if [[ ${SPLASH_MODE_REQ} == "verbose" ]]; then
-		/sbin/fbcondecor_ctl -c on 2>/dev/null
+		${spl_util} -c setmode 2>/dev/null
 		return 0
 	elif [[ ${SPLASH_MODE_REQ} != "silent" ]]; then
 		return 0
@@ -263,7 +264,7 @@
 	[[ ${SPLASH_KDMODE} == "GRAPHICS" ]] && options="--kdgraphics"
 
 	# Start the splash daemon
-	BOOT_MSG="$(splash_get_boot_message)" ${spl_daemon} -d --theme=${SPLASH_THEME} --pidfile=${spl_pidfile} ${options}
+	BOOT_MSG="$(splash_get_boot_message)" ${spl_daemon} -t ${SPLASH_THEME} --pidfile=${spl_pidfile} ${options}
 
 	# Set the silent TTY and boot message
 	splash_comm_send "set tty silent ${SPLASH_TTY}"
@@ -271,22 +272,28 @@
 	if [[ ${SPLASH_MODE_REQ} == "silent" ]] ; then
 		splash_comm_send "set mode silent"
 		splash_comm_send "repaint"
-		/sbin/fbcondecor_ctl -c on 2>/dev/null
+		${spl_util} -c setmode 2>/dev/null
 	fi
 
-	# Set the input device if it exists. This will make it possible to use F2 to
-	# switch from verbose to silent.
-	local t=$(grep -Hsi keyboard /sys/class/input/input*/name | sed -e 's#.*input\\([0-9]*\\)/name.*#event\\1#')
-	if [[ -z "${t}" ]]; then
-		t=$(grep -Hsi keyboard /sys/class/input/event*/device/driver/description | grep -o 'event[0-9]\+')
-		if [[ -z "${t}" ]]; then
-			# Try an alternative method of finding the event device. The idea comes
-			# from Bombadil <bombadil(at)h3c.de>. We're couting on the keyboard controller
-			# being the first device handled by kbd listed in input/devices.
-			t=$(/bin/grep -s -m 1 '^H: Handlers=kbd' /proc/bus/input/devices | grep -o 'event[0-9]*')
-		fi
-	fi
-	[[ -n "${t}" ]] && splash_comm_send "set event dev /dev/input/${t}"
+        local devbus=/proc/bus/input/devices
+        local kbd
+
+        set -- $(grep -s '^H: Handlers=kbd' ${devbus} | grep -o 'event[0-9]*')
+        kbd=$1
+
+        if [ -z "${kbd}" ]; then
+               local class="/sys/class/input"
+                        
+               for event in $(ls ${class}/event*); do
+                        grep -Hsi keyboard ${event}/device/driver/description >/dev/null
+                            [ $? -eq 0 ] || continue
+
+                            kbd=${event}
+                            break
+               done
+        fi
+
+	[[ -n "${kbd}" ]] && splash_comm_send "set event dev /dev/input/${kbd}"
 
 	return 0
 }
@@ -335,7 +342,7 @@
 
 	splash_profile "comm $*"
 
-	if [[ -r /proc/$(<${spl_pidfile})/status &&                                              
+	if [[ -r /proc/$(<${spl_pidfile})/status &&
 		  "$((read t;echo ${t/Name:/}) </proc/$(<${spl_pidfile})/status)" == "fbsplashd.stati" ]]; then
 		echo "$*" > ${spl_fifo} &
 	else
@@ -351,7 +358,8 @@
 	if [[ ${ctty} == "${SPLASH_TTY}" ]]; then
 		echo "silent"
 	else
-		if [[ -z "$(/sbin/fbcondecor_ctl -c getstate --vc=$(($ctty-1)) 2>/dev/null | grep off)" ]]; then
+		#if [[ -z "$(${spl_util} -c getstate --vc=$(($ctty-1)) 2>/dev/null | grep off)" ]]; then
+		if [[ "$(${spl_util} -c getmode)" = verbose ]]; then
 			echo "verbose"
 		else
 			echo "off"
@@ -371,7 +379,7 @@
 # Switches to silent mode.
 splash_silent() {
 	splash_comm_send "set mode silent"
-	/sbin/fbcondecor_ctl -c on 2>/dev/null
+	${spl_util} -c setmode 2>/dev/null
 }
 
 splash_load_vars() {
@@ -540,7 +548,7 @@
 
 splash_cache_cleanup() {
 	# FIXME: Make sure the splash daemon is dead.
-	killall -9 fbsplashd.static >/dev/null 2>/dev/null
+	killall -9  ${spl_daemon##*/} 2>/dev/null
 	rm -f "${spl_pidfile}"
 
 	# There's no point in saving all the data if we're running off a livecd.