Attachment #46132 for bug #74425

Lines 163-168 Link Here

(-)/sbin/rc.orig (+9 lines)
163	try mount -n ${mntcmd:--t proc none /proc}	163	try mount -n ${mntcmd:--t proc none /proc}
164	eend $?	164	eend $?
165		165
		166	# start logging here
		167	start_boot_profile
		168
166	# Read off the kernel commandline to see if there's any special settings	169	# Read off the kernel commandline to see if there's any special settings
167	# especially check to see if we need to set the CDBOOT environment variable	170	# especially check to see if we need to set the CDBOOT environment variable
168	# Note: /proc MUST be mounted	171	# Note: /proc MUST be mounted
Lines 409-414 Link Here
409	local retval=	412	local retval=
410	local service=$1	413	local service=$1
411		414
		415	process_name "${service}"
		416
412	source "/etc/init.d/${service}" \|\| eerror "Failed to source /etc/init.d/${service}"	417	source "/etc/init.d/${service}" \|\| eerror "Failed to source /etc/init.d/${service}"
413	retval=$?	418	retval=$?
414	[ "${retval}" -ne 0 ] && return "${retval}"	419	[ "${retval}" -ne 0 ] && return "${retval}"
Lines 509-514 Link Here
509	# Now that the dependency cache are up to date, make sure these	514	# Now that the dependency cache are up to date, make sure these
510	# are marked as started ...	515	# are marked as started ...
511	(	516	(
		517	process_name mark "${x}" started
		518
512	# Needed for mark_service_started()	519	# Needed for mark_service_started()
513	source "${svclib}/sh/rc-services.sh"	520	source "${svclib}/sh/rc-services.sh"
514		521
Lines 879-884 Link Here
879	# Runlevel end, so clear stale fail list	886	# Runlevel end, so clear stale fail list
880	rm -rf "${svcdir}/failed" &>/dev/null	887	rm -rf "${svcdir}/failed" &>/dev/null
881		888
		889	[ -z "${BOOT}" ] && stop_boot_profile
		890
882	# If we were in the boot runlevel, it is done now ...	891	# If we were in the boot runlevel, it is done now ...
883	[ -n "${BOOT}" ] && unset BOOT	892	[ -n "${BOOT}" ] && unset BOOT
884		893




# 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

Lines 415-421 Link Here

(-)/lib/rcscripts/sh/rc-services.sh.orig (-1 / +5 lines)
415	mark_service_started "$1"	415	mark_service_started "$1"
416	splash "svc_started" "$1" "0"	416	splash "svc_started" "$1" "0"
417	else	417	else
418	(. /sbin/runscript.sh "/etc/init.d/$1" start)	418	(
		419	process_name "$1"
		420
		421	. /sbin/runscript.sh "/etc/init.d/$1" start
		422	)
419	retval="$?"	423	retval="$?"
420	splash "svc_started" "$1" "${retval}"	424	splash "svc_started" "$1" "${retval}"
421	return "${retval}"	425	return "${retval}"

Return to bug 74425

Lines 63-68 Link Here

(-)/sbin/functions.sh.orig (+23 lines)
63	# This will override the splash() function...	63	# This will override the splash() function...
64	[ -f /sbin/splash-functions.sh ] && source /sbin/splash-functions.sh	64	[ -f /sbin/splash-functions.sh ] && source /sbin/splash-functions.sh
65		65
		66	# void process_name(...)
		67	#
		68	# Notify bootchart about a subshell and what name should
		69	# be used for it
		70
		71	process_name() {
		72	return 0
		73	}
		74
		75	start_boot_profile() {
		76	return 0
		77	}
		78
		79	stop_boot_profile()
		80	{
		81	return 0
		82	}
		83
		84	# This will override the process_name, start_boot_profile and stop_boot_profile
		85	if [[ ${RC_USE_BOOTCHART} = "yes" ]] && [[ -f /sbin/boot_profile_functions.sh ]] ; then
		86	source /sbin/boot_profile_functions.sh
		87	fi
		88
66	# void get_bootconfig()	89	# void get_bootconfig()
67	#	90	#
68	# Get the BOOTLEVEL and SOFTLEVEL by setting	91	# Get the BOOTLEVEL and SOFTLEVEL by setting