Attachment #45990 for bug #74425

Lines 143-148 Link Here

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




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

[ -f /sbin/bootchart-functions.sh ] && source /sbin/bootchart-functions.sh

# 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 (+11 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	[ -f /sbin/bootchart-functions.sh ] && source /sbin/bootchart-functions.sh
		76
66	# void get_bootconfig()	77	# void get_bootconfig()
67	#	78	#
68	# Get the BOOTLEVEL and SOFTLEVEL by setting	79	# Get the BOOTLEVEL and SOFTLEVEL by setting