--- /sbin/rc.orig 2004-12-15 06:13:31.000000000 -0600 +++ /sbin/rc 2004-12-15 10:04:01.874070864 -0600 @@ -163,6 +163,9 @@ try mount -n ${mntcmd:--t proc none /proc} eend $? + # start logging here + start_boot_profile + # Read off the kernel commandline to see if there's any special settings # especially check to see if we need to set the CDBOOT environment variable # Note: /proc MUST be mounted @@ -409,6 +412,8 @@ local retval= local service=$1 + process_name "${service}" + source "/etc/init.d/${service}" || eerror "Failed to source /etc/init.d/${service}" retval=$? [ "${retval}" -ne 0 ] && return "${retval}" @@ -509,6 +514,8 @@ # Now that the dependency cache are up to date, make sure these # are marked as started ... ( + process_name mark "${x}" started + # Needed for mark_service_started() source "${svclib}/sh/rc-services.sh" @@ -879,6 +886,8 @@ # Runlevel end, so clear stale fail list rm -rf "${svcdir}/failed" &>/dev/null +[ -z "${BOOT}" ] && stop_boot_profile + # If we were in the boot runlevel, it is done now ... [ -n "${BOOT}" ] && unset BOOT --- /sbin/functions.sh.orig 2004-12-15 09:54:55.219175040 -0600 +++ /sbin/functions.sh 2004-12-15 10:10:28.340319064 -0600 @@ -63,6 +63,29 @@ # This will override the splash() function... [ -f /sbin/splash-functions.sh ] && source /sbin/splash-functions.sh +# void process_name(...) +# +# Notify bootchart about a subshell and what name should +# be used for it + +process_name() { + return 0 +} + +start_boot_profile() { + return 0 +} + +stop_boot_profile() +{ + return 0 +} + +# This will override the process_name, start_boot_profile and stop_boot_profile +if [[ ${RC_USE_BOOTCHART} = "yes" ]] && [[ -f /sbin/boot_profile_functions.sh ]] ; then + source /sbin/boot_profile_functions.sh +fi + # void get_bootconfig() # # Get the BOOTLEVEL and SOFTLEVEL by setting --- /lib/rcscripts/sh/rc-services.sh.orig 2004-12-13 12:40:01.000000000 -0600 +++ /lib/rcscripts/sh/rc-services.sh 2004-12-15 09:56:02.805900296 -0600 @@ -415,7 +415,11 @@ mark_service_started "$1" splash "svc_started" "$1" "0" else - (. /sbin/runscript.sh "/etc/init.d/$1" start) + ( + process_name "$1" + + . /sbin/runscript.sh "/etc/init.d/$1" start + ) retval="$?" splash "svc_started" "$1" "${retval}" return "${retval}"