diff -urN rc-scripts-1.4.3.11p2/sbin/functions.sh rc-scripts-1.4.3.11p2.bootsplash/sbin/functions.sh --- rc-scripts-1.4.3.11p2/sbin/functions.sh 2003-10-17 08:45:23.000000000 +0200 +++ rc-scripts-1.4.3.11p2.bootsplash/sbin/functions.sh 2003-10-17 09:07:49.000000000 +0200 @@ -359,17 +359,49 @@ fi } -if [ -x /sbin/splash ] && \ - [ -e /proc/version -a -e /proc/splash ] -then - rc_splash() { - /sbin/splash $* - } -else - rc_splash() { - return 0 - } -fi +update_splash_wrappers() { + if [ -x /sbin/splash ] && \ + ([ ! -e /proc/version ] || \ + [ -e /proc/version -a -e /proc/splash ]) + then + rc_splash() { + /sbin/splash $* + } + rc_splash_init() { + splash_init $* + } + rc_splash_calc() { + splash_calc $* + } + rc_splash_update() { + splash_update $* + } + rc_splash_debug() { + splash_debug $* + } + else + rc_splash() { + return 0 + } + rc_splash_init() { + return 0 + } + rc_splash_calc() { + return 0 + } + rc_splash_update() { + return 0 + } + rc_splash_debug() { + return 0 + } + fi + + export rc_splash rc_splash_init rc_splash_calc \ + rc_splash_update rc_splash_debug +} + +update_splash_wrappers # void esyslog(char* priority, char* tag, char* message) # diff -urN rc-scripts-1.4.3.11p2/sbin/rc rc-scripts-1.4.3.11p2.bootsplash/sbin/rc --- rc-scripts-1.4.3.11p2/sbin/rc 2003-10-17 08:45:23.000000000 +0200 +++ rc-scripts-1.4.3.11p2.bootsplash/sbin/rc 2003-10-17 09:07:25.000000000 +0200 @@ -20,6 +20,10 @@ if [ "${retval}" -ne 0 ] || \ ([ "${*/mount/}" != "$*" -a -n "${errstr}" ]) then + # Progressbar begin + rc_splash "stop" &> /dev/null & + # Progressbar end + echo -e "${ENDCOL}${NORMAL}[${BAD} oops ${NORMAL}]" echo eerror "The \"${1}\" command failed with error:" @@ -84,7 +88,7 @@ argv1="$1" # Progressbar begin -splash_init +rc_splash_init # Progressbar end # First time boot stuff goes here. Note that 'sysinit' is an internal runlevel @@ -226,6 +230,8 @@ fi fi + # Update splash wrappers. + update_splash_wrappers # Progressbar begin rc_splash "text" # Progressbar end @@ -311,7 +317,7 @@ for x in ${CRITICAL_SERVICES} do # Progressbar begin - splash_update "inline" "${x}" "start" + rc_splash_update "inline" "${x}" "start" # Progressbar end if ! start_critical_service "${x}" @@ -359,10 +365,13 @@ ) fi # Sysinit ends here +# Update splash wrappers. +update_splash_wrappers + if [ "${RUNLEVEL}" = "S" -a "${argv1}" = "sysinit" ] then # Progressbar begin - splash_debug "${argv1}" + rc_splash_debug "${argv1}" # Progressbar end exit 0 @@ -421,7 +430,7 @@ fi # Progressbar begin -splash_calc +rc_splash_calc # Progressbar end # For keeping a list of services that fails during boot/halt @@ -616,7 +625,7 @@ source /sbin/functions.sh # Progressbar begin - splash_debug "${SOFTLEVEL}" + rc_splash_debug "${SOFTLEVEL}" # Progressbar end # Make sure that our $svcdir are clean for next reboot ... @@ -705,7 +714,7 @@ [ -n "${BOOT}" ] && unset BOOT # Progressbar begin -splash_debug "${SOFTLEVEL}" +rc_splash_debug "${SOFTLEVEL}" # Progressbar end diff -urN rc-scripts-1.4.3.11p2/sbin/runscript.sh rc-scripts-1.4.3.11p2.bootsplash/sbin/runscript.sh --- rc-scripts-1.4.3.11p2/sbin/runscript.sh 2003-10-17 08:45:23.000000000 +0200 +++ rc-scripts-1.4.3.11p2.bootsplash/sbin/runscript.sh 2003-10-17 08:44:32.000000000 +0200 @@ -447,11 +447,11 @@ case "${arg}" in stop) svc_stop - splash_update "live" "$myservice" "stop" + rc_splash_update "live" "$myservice" "stop" ;; start) svc_start - splash_update "live" "$myservice" "start" + rc_splash_update "live" "$myservice" "start" ;; needsme|ineed|usesme|iuse|broken) list_depend_trace "${arg}"