diff -Naur sbin/functions.sh sbin-new/functions.sh --- sbin/functions.sh 2004-06-15 18:32:24.000000000 +0200 +++ sbin-new/functions.sh 2004-08-03 01:58:42.000000000 +0200 @@ -123,9 +123,7 @@ pb_scripts=0 pb_rate=0 - if [ ! -x /sbin/splash ] || \ - [ -e /proc/version -a ! -e /proc/splash ] - then + if [ ! -x /sbin/splash ]; then return 0 fi @@ -157,7 +155,7 @@ pb_scripts=${#pb_runs[*]} pb_boot=${#pb_runb[*]} - [ ! -e /proc/splash -o ! -x /sbin/splash ] && return 0 + [ ! -x /sbin/splash ] && return 0 if [ -f /etc/conf.d/bootsplash.conf ] then @@ -216,7 +214,7 @@ local myscript="$2" local action="$3" - [ ! -e /proc/splash -o ! -x /sbin/splash ] && return 0 + [ ! -x /sbin/splash ] && return 0 if [ "${fsstate}" = "inline" ] then @@ -258,7 +256,7 @@ splash_debug() { local softlevel="$1" - [ ! -e /proc/splash -o ! -x /sbin/splash ] && return 0 + [ ! -x /sbin/splash ] && return 0 if [ -f /etc/conf.d/bootsplash.conf ] then @@ -280,10 +278,7 @@ } update_splash_wrappers() { - if [ -x /sbin/splash ] && \ - ([ ! -e /proc/version ] || \ - [ -e /proc/version -a -e /proc/splash ]) - then + if [ -x /sbin/splash ]; then rc_splash() { /sbin/splash $* } diff -Naur sbin/rc sbin-new/rc --- sbin/rc 2004-06-15 18:32:24.000000000 +0200 +++ sbin-new/rc 2004-08-03 02:10:32.000000000 +0200 @@ -632,6 +632,7 @@ dep_stop "${i}" done else + rc_splash "start" get_critical_services is_critical_service() {