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

Collapse All | Expand All

(-)rc-scripts-1.4.3.13p1-orig/sbin/functions.sh (-6 / +6 lines)
Lines 130-138 Link Here
130
		return 0
130
		return 0
131
	fi
131
	fi
132
	
132
	
133
	if [ -f /etc/conf.d/bootsplash.conf ]
133
	if [ -f /etc/conf.d/bootsplash ]
134
	then
134
	then
135
		. /etc/conf.d/bootsplash.conf
135
		. /etc/conf.d/bootsplash
136
		if [ -n "${PROGRESS_SYSINIT_RATE}" ]
136
		if [ -n "${PROGRESS_SYSINIT_RATE}" ]
137
		then
137
		then
138
			rate=$((65535*${PROGRESS_SYSINIT_RATE}/100))
138
			rate=$((65535*${PROGRESS_SYSINIT_RATE}/100))
Lines 160-168 Link Here
160
160
161
	[ ! -e /proc/splash -o ! -x /sbin/splash ] && return 0
161
	[ ! -e /proc/splash -o ! -x /sbin/splash ] && return 0
162
162
163
	if [ -f /etc/conf.d/bootsplash.conf ]
163
	if [ -f /etc/conf.d/bootsplash ]
164
	then
164
	then
165
		. /etc/conf.d/bootsplash.conf
165
		. /etc/conf.d/bootsplash
166
166
167
		if [ -n "${PROGRESS_SYSINIT_RATE}" ]
167
		if [ -n "${PROGRESS_SYSINIT_RATE}" ]
168
		then
168
		then
Lines 261-269 Link Here
261
261
262
	[ ! -e /proc/splash -o ! -x /sbin/splash ] && return 0
262
	[ ! -e /proc/splash -o ! -x /sbin/splash ] && return 0
263
	
263
	
264
	if [ -f /etc/conf.d/bootsplash.conf ]
264
	if [ -f /etc/conf.d/bootsplash ]
265
	then
265
	then
266
		source /etc/conf.d/bootsplash.conf
266
		source /etc/conf.d/bootsplash
267
267
268
		[ "${BOOTSPLASH_DEBUG}" = "yes" -a -n "${softlevel}" ] || return
268
		[ "${BOOTSPLASH_DEBUG}" = "yes" -a -n "${softlevel}" ] || return
269
		
269
		
(-)rc-scripts-1.4.3.13p1-orig/sbin/rc (-6 / +18 lines)
Lines 173-178 Link Here
173
	try try mount -n -t proc none /proc
173
	try try mount -n -t proc none /proc
174
	eend $?
174
	eend $?
175
175
176
	# Update splash wrappers.
177
	update_splash_wrappers
178
	# Progressbar begin
179
	rc_splash "text"
180
	# Progressbar end
181
176
	# Read off the kernel commandline to see if there's any special settings
182
	# Read off the kernel commandline to see if there's any special settings
177
	# especially check to see if we need to set the  CDBOOT environment variable
183
	# especially check to see if we need to set the  CDBOOT environment variable
178
	# Note: /proc MUST be mounted
184
	# Note: /proc MUST be mounted
Lines 261-266 Link Here
261
			try mount -n -t devfs none /dev
267
			try mount -n -t devfs none /dev
262
			eend $?
268
			eend $?
263
		else
269
		else
270
			# Progressbar begin
271
			rc_splash "stop" &> /dev/null &
272
			# Progressbar end
273
264
			clear
274
			clear
265
			echo
275
			echo
266
			einfo "The Gentoo Linux system initialization scripts have detected that your"
276
			einfo "The Gentoo Linux system initialization scripts have detected that your"
Lines 317-328 Link Here
317
		fi
327
		fi
318
	fi
328
	fi
319
329
320
	# Update splash wrappers.
321
	update_splash_wrappers
322
	# Progressbar begin
323
	rc_splash "text"
324
	# Progressbar end
325
326
	if [ -x /sbin/irqbalance -a "$(get_KV)" -ge "$(KV_to_int '2.5.0')" ]
330
	if [ -x /sbin/irqbalance -a "$(get_KV)" -ge "$(KV_to_int '2.5.0')" ]
327
	then
331
	then
328
		ebegin "Starting irqbalance"
332
		ebegin "Starting irqbalance"
Lines 667-672 Link Here
667
		dep_stop "${i}"
671
		dep_stop "${i}"
668
	done
672
	done
669
else
673
else
674
	# Update splash wrappers.
675
	update_splash_wrappers
676
	# Progressbar begin
677
	rc_splash_init
678
	rc_splash "start"
679
	rc_splash "text"
680
	# Progressbar end
681
670
	get_critical_services
682
	get_critical_services
671
683
672
	is_critical_service() {
684
	is_critical_service() {

Return to bug 45784