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

Collapse All | Expand All

(-)rc-scripts-1.4.3.11p2/sbin/functions.sh (-11 / +43 lines)
Lines 359-375 Link Here
359
	fi
359
	fi
360
}
360
}
361
361
362
if [ -x /sbin/splash ] && \
362
update_splash_wrappers() {
363
   [ -e /proc/version -a -e /proc/splash ]
363
	if [ -x /sbin/splash ] && \
364
then
364
	   ([ ! -e /proc/version ] || \
365
	rc_splash() {
365
	    [ -e /proc/version -a -e /proc/splash ])
366
		/sbin/splash $*
366
	then
367
	}
367
		rc_splash() {
368
else
368
			/sbin/splash $*
369
	rc_splash() {
369
		}
370
		return 0
370
		rc_splash_init() {
371
	}
371
			splash_init $*
372
fi
372
		}
373
		rc_splash_calc() {
374
			splash_calc $*
375
		}
376
		rc_splash_update() {
377
			splash_update $*
378
		}
379
		rc_splash_debug() {
380
			splash_debug $*
381
		}
382
	else
383
		rc_splash() {
384
			return 0
385
		}
386
		rc_splash_init() {
387
			return 0
388
		}
389
		rc_splash_calc() {
390
			return 0
391
		}
392
		rc_splash_update() {
393
			return 0
394
		}
395
		rc_splash_debug() {
396
			return 0
397
		}
398
	fi
399
400
	export rc_splash rc_splash_init rc_splash_calc \
401
		rc_splash_update rc_splash_debug
402
}
403
404
update_splash_wrappers
373
405
374
# void esyslog(char* priority, char* tag, char* message)
406
# void esyslog(char* priority, char* tag, char* message)
375
#
407
#
(-)rc-scripts-1.4.3.11p2/sbin/rc (-6 / +15 lines)
Lines 20-25 Link Here
20
	if [ "${retval}" -ne 0 ] || \
20
	if [ "${retval}" -ne 0 ] || \
21
	   ([ "${*/mount/}" != "$*" -a -n "${errstr}" ])
21
	   ([ "${*/mount/}" != "$*" -a -n "${errstr}" ])
22
	then
22
	then
23
		# Progressbar begin
24
		rc_splash "stop" &> /dev/null &
25
		# Progressbar end
26
23
		echo -e "${ENDCOL}${NORMAL}[${BAD} oops ${NORMAL}]"
27
		echo -e "${ENDCOL}${NORMAL}[${BAD} oops ${NORMAL}]"
24
		echo
28
		echo
25
		eerror "The \"${1}\" command failed with error:"
29
		eerror "The \"${1}\" command failed with error:"
Lines 84-90 Link Here
84
argv1="$1"
88
argv1="$1"
85
89
86
# Progressbar begin
90
# Progressbar begin
87
splash_init
91
rc_splash_init
88
# Progressbar end
92
# Progressbar end
89
93
90
# First time boot stuff goes here.  Note that 'sysinit' is an internal runlevel
94
# First time boot stuff goes here.  Note that 'sysinit' is an internal runlevel
Lines 226-231 Link Here
226
		fi
230
		fi
227
	fi
231
	fi
228
232
233
	# Update splash wrappers.
234
	update_splash_wrappers
229
	# Progressbar begin
235
	# Progressbar begin
230
	rc_splash "text"
236
	rc_splash "text"
231
	# Progressbar end
237
	# Progressbar end
Lines 311-317 Link Here
311
	for x in ${CRITICAL_SERVICES}
317
	for x in ${CRITICAL_SERVICES}
312
	do
318
	do
313
		# Progressbar begin
319
		# Progressbar begin
314
		splash_update "inline" "${x}" "start"
320
		rc_splash_update "inline" "${x}" "start"
315
		# Progressbar end
321
		# Progressbar end
316
322
317
		if ! start_critical_service "${x}"
323
		if ! start_critical_service "${x}"
Lines 359-368 Link Here
359
	)
365
	)
360
fi # Sysinit ends here
366
fi # Sysinit ends here
361
367
368
# Update splash wrappers.
369
update_splash_wrappers
370
362
if [ "${RUNLEVEL}" = "S" -a "${argv1}" = "sysinit" ]
371
if [ "${RUNLEVEL}" = "S" -a "${argv1}" = "sysinit" ]
363
then
372
then
364
	# Progressbar begin
373
	# Progressbar begin
365
	splash_debug "${argv1}"
374
	rc_splash_debug "${argv1}"
366
	# Progressbar end
375
	# Progressbar end
367
	exit 0
376
	exit 0
368
377
Lines 421-427 Link Here
421
fi
430
fi
422
431
423
# Progressbar begin
432
# Progressbar begin
424
splash_calc
433
rc_splash_calc
425
# Progressbar end
434
# Progressbar end
426
435
427
# For keeping a list of services that fails during boot/halt
436
# For keeping a list of services that fails during boot/halt
Lines 616-622 Link Here
616
	source /sbin/functions.sh
625
	source /sbin/functions.sh
617
	
626
	
618
	# Progressbar begin
627
	# Progressbar begin
619
	splash_debug "${SOFTLEVEL}"
628
	rc_splash_debug "${SOFTLEVEL}"
620
	# Progressbar end
629
	# Progressbar end
621
630
622
	# Make sure that our $svcdir are clean for next reboot ...
631
	# Make sure that our $svcdir are clean for next reboot ...
Lines 705-711 Link Here
705
[ -n "${BOOT}" ] && unset BOOT
714
[ -n "${BOOT}" ] && unset BOOT
706
715
707
# Progressbar begin
716
# Progressbar begin
708
splash_debug "${SOFTLEVEL}"
717
rc_splash_debug "${SOFTLEVEL}"
709
# Progressbar end
718
# Progressbar end
710
719
711
720
(-)rc-scripts-1.4.3.11p2/sbin/runscript.sh (-2 / +2 lines)
Lines 447-457 Link Here
447
	case "${arg}" in
447
	case "${arg}" in
448
	stop)
448
	stop)
449
		svc_stop
449
		svc_stop
450
		splash_update "live" "$myservice" "stop"
450
		rc_splash_update "live" "$myservice" "stop"
451
		;;
451
		;;
452
	start)
452
	start)
453
		svc_start
453
		svc_start
454
		splash_update "live" "$myservice" "start"
454
		rc_splash_update "live" "$myservice" "start"
455
		;;
455
		;;
456
	needsme|ineed|usesme|iuse|broken)
456
	needsme|ineed|usesme|iuse|broken)
457
		list_depend_trace "${arg}"
457
		list_depend_trace "${arg}"

Return to bug 21019