Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 74425 | Differences between
and this patch

Collapse All | Expand All

(-)/lib/rcscripts/sh/rc-services.sh.orig (-1 / +7 lines)
Lines 377-383 Link Here
377
		|| ${START_CRITICAL} == "yes" ]] ; then
377
		|| ${START_CRITICAL} == "yes" ]] ; then
378
		# if we can not start the services in parallel
378
		# if we can not start the services in parallel
379
		# then just start it and return the exit status
379
		# then just start it and return the exit status
380
		( "/etc/init.d/${service}" start )
380
		(
381
			profiling name "/etc/init.d/${service} start"
382
383
			"/etc/init.d/${service}" start 
384
		)
381
		retval="$?"
385
		retval="$?"
382
		splash "svc_started" "${service}" "${retval}"
386
		splash "svc_started" "${service}" "${retval}"
383
		end_service "${service}" "${retval}"
387
		end_service "${service}" "${retval}"
Lines 385-390 Link Here
385
	else
389
	else
386
		# if parallel startup is allowed, start it in background
390
		# if parallel startup is allowed, start it in background
387
		(
391
		(
392
			profiling name "/etc/init.d/${service} start"
393
388
			"/etc/init.d/${service}" start 
394
			"/etc/init.d/${service}" start 
389
			retval="$?"
395
			retval="$?"
390
			splash "svc_started" "${service}" "${retval}"
396
			splash "svc_started" "${service}" "${retval}"
(-)/sbin/rc.orig (+7 lines)
Lines 228-233 Link Here
228
	try mount -n ${mntcmd:--t proc proc /proc}
228
	try mount -n ${mntcmd:--t proc proc /proc}
229
	eend $?
229
	eend $?
230
230
231
	# start profilint init since we have /proc
232
	profiling start
233
231
	# Read off the kernel commandline to see if there's any special settings
234
	# Read off the kernel commandline to see if there's any special settings
232
	# especially check to see if we need to set the  CDBOOT environment variable
235
	# especially check to see if we need to set the  CDBOOT environment variable
233
	# Note: /proc MUST be mounted
236
	# Note: /proc MUST be mounted
Lines 471-476 Link Here
471
		# Needed for some addons like dm-crypt that starts in critical services
474
		# Needed for some addons like dm-crypt that starts in critical services
472
		local myservice=$1
475
		local myservice=$1
473
476
477
		profiling name "/etc/init.d/${service} start"
478
474
		source "/etc/init.d/${service}" || eerror "Failed to source /etc/init.d/${service}"
479
		source "/etc/init.d/${service}" || eerror "Failed to source /etc/init.d/${service}"
475
		retval=$?
480
		retval=$?
476
		[ "${retval}" -ne 0 ] && return "${retval}"
481
		[ "${retval}" -ne 0 ] && return "${retval}"
Lines 587-592 Link Here
587
	# Now that the dependency cache are up to date, make sure these
592
	# Now that the dependency cache are up to date, make sure these
588
	# are marked as started ...
593
	# are marked as started ...
589
	(
594
	(
595
		profiling name "mark started"
596
590
		# Needed for mark_service_started()
597
		# Needed for mark_service_started()
591
		source "${svclib}/sh/rc-services.sh"
598
		source "${svclib}/sh/rc-services.sh"
592
		
599
		

Return to bug 74425