Attachment #45995 for bug #74425

Lines 143-148 Link Here

(-)/sbin/rc.orig (-3 / +25 lines)
143	fi	143	fi
144	eend $?	144	eend $?
145		145
		146	# start logging here
		147	if [[ ${RC_USE_BOOTCHART} = "yes" ]] && [[ -x /sbin/bootlog ]] ; then
		148	/sbin/bootlog start
		149	fi
		150
146	# Read off the kernel commandline to see if there's any special settings	151	# Read off the kernel commandline to see if there's any special settings
147	# especially check to see if we need to set the CDBOOT environment variable	152	# especially check to see if we need to set the CDBOOT environment variable
148	# Note: /proc MUST be mounted	153	# Note: /proc MUST be mounted
Lines 373-387 Link Here
373		378
374	start_critical_service() {	379	start_critical_service() {
375	(	380	(
		381	local service="$1"
		382
		383	process_name "${service}"
		384
376	local retval=	385	local retval=
377		386
378	source "/etc/init.d/${x}" \|\| eerror "Failed to source /etc/init.d/${x}"	387	source "/etc/init.d/${service}" \|\| eerror "Failed to source /etc/init.d/${service}"
379	retval=$?	388	retval=$?
380	[ "${retval}" -ne 0 ] && return "${retval}"	389	[ "${retval}" -ne 0 ] && return "${retval}"
381	[ -e "/etc/conf.d/${x}" ] && source "/etc/conf.d/${x}"	390	[ -e "/etc/conf.d/${service}" ] && source "/etc/conf.d/${service}"
382	source /etc/rc.conf	391	source /etc/rc.conf
383		392
384	start \|\| eerror "Failed to start /etc/init.d/${x}"	393	start \|\| eerror "Failed to start /etc/init.d/${service}"
385	retval=$?	394	retval=$?
386		395
387	return "${retval}"	396	return "${retval}"
Lines 475-480 Link Here
475	# Now that the dependency cache are up to date, make sure these	484	# Now that the dependency cache are up to date, make sure these
476	# are marked as started ...	485	# are marked as started ...
477	(	486	(
		487	process_name mark "${x}" started
		488
478	# Needed for mark_service_started()	489	# Needed for mark_service_started()
479	source "${svclib}/sh/rc-services.sh"	490	source "${svclib}/sh/rc-services.sh"
480		491
Lines 846-851 Link Here
846	# Runlevel end, so clear stale fail list	857	# Runlevel end, so clear stale fail list
847	rm -rf "${svcdir}/failed" &>/dev/null	858	rm -rf "${svcdir}/failed" &>/dev/null
848		859
		860	if [ -z "${BOOT}" ] && [[ ${RC_USE_BOOTCHART} = "yes" ]] && [[ -x /sbin/bootlog ]] ; then
		861	(
		862	process_name bootlog stop
		863
		864	# wait a little bit to let X and the gettys get started
		865	# then stop logging.
		866	sleep 20
		867	/sbin/bootlog stop
		868	) &
		869	fi
		870
849	# If we were in the boot runlevel, it is done now ...	871	# If we were in the boot runlevel, it is done now ...
850	[ -n "${BOOT}" ] && unset BOOT	872	[ -n "${BOOT}" ] && unset BOOT
851		873




# 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
}

# This will override the process_name() function
if [[ ${RC_USE_BOOTCHART} = "yes" ]] && [[ -f /sbin/bootchart-functions.sh ]] ; then
	source /sbin/bootchart-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}"

Lines 45-52 Link Here

(-)/etc/conf.d/rc.orig (-1 / +4 lines)
45	RC_DEVICE_TARBALL="yes"	45	RC_DEVICE_TARBALL="yes"
46		46
47		47
		48	# set to "yes" if you want the rc system to create the logs
		49	# required for bootchart. You should also emerge bootchart
		50	# to create and visualize the charz.
48		51
49		52	RC_USE_BOOTCHART="yes"
50		53
51	#	54	#
52	# Controlling start-stop-daemon behavior	55	# Controlling start-stop-daemon behavior

Return to bug 74425

Lines 63-68 Link Here

(-)/sbin/functions.sh.orig (+14 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	# This will override the process_name() function
		76	if [[ ${RC_USE_BOOTCHART} = "yes" ]] && [[ -f /sbin/bootchart-functions.sh ]] ; then
		77	source /sbin/bootchart-functions.sh
		78	fi
		79
66	# void get_bootconfig()	80	# void get_bootconfig()
67	#	81	#
68	# Get the BOOTLEVEL and SOFTLEVEL by setting	82	# Get the BOOTLEVEL and SOFTLEVEL by setting