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

Collapse All | Expand All

(-)rc (-3 / +20 lines)
Lines 17-29 Link Here
17
	# if we only check $? for instance ...  We thus need to [ -n "${errstr}" ]
17
	# if we only check $? for instance ...  We thus need to [ -n "${errstr}" ]
18
	# as well.
18
	# as well.
19
	
19
	
20
	errstr="$((eval $*) 2>&1 >/dev/null)"
20
	if [ -c /dev/null ] ; then
21
		errstr="$((eval $*) 2>&1 > /dev/null)"
22
	else
23
		errstr="$((eval $*) 2>&1)"
24
	fi
21
	retval=$?
25
	retval=$?
22
	if [ "${retval}" -ne 0 ] || \
26
	if [ "${retval}" -ne 0 ] || \
23
	   ([ "${*/mount/}" != "$*" -a -n "${errstr}" ])
27
	   ([ "${*/mount/}" != "$*" -a -n "${errstr}" ])
24
	then
28
	then
25
		# Progressbar begin
29
		# Progressbar begin
26
		rc_splash "stop" &> /dev/null &
30
		if [ -c /dev/null ] ; then
31
			rc_splash "stop" >& /dev/null &
32
		else
33
			rc_splash "stop"
34
		fi
27
		# Progressbar end
35
		# Progressbar end
28
36
29
		echo -e "${ENDCOL}${NORMAL}[${BAD} oops ${NORMAL}]"
37
		echo -e "${ENDCOL}${NORMAL}[${BAD} oops ${NORMAL}]"
Lines 36-42 Link Here
36
		echo
44
		echo
37
		/sbin/sulogin ${CONSOLE}
45
		/sbin/sulogin ${CONSOLE}
38
		einfo "Unmounting filesystems"
46
		einfo "Unmounting filesystems"
39
		/bin/mount -a -o remount,ro & >/dev/null
47
		if [ -c /dev/null ] ; then
48
			/bin/mount -a -o remount,ro & >/dev/null
49
		else
50
			/bin/mount -a -o remount,ro
51
		fi
40
		einfo "Rebooting"
52
		einfo "Rebooting"
41
		/sbin/reboot -f
53
		/sbin/reboot -f
42
	fi
54
	fi
Lines 162-167 Link Here
162
	# Setup initial $PATH just in case
174
	# Setup initial $PATH just in case
163
	PATH="/bin:/sbin:/usr/bin:/usr/sbin:${PATH}"
175
	PATH="/bin:/sbin:/usr/bin:/usr/sbin:${PATH}"
164
176
177
	if [ ! -c /dev/null ] ; then
178
		echo -e "${BAD}Your root filesystem is missing /dev/null${NORMAL}"
179
		echo -e "${BAD}You should really get this sorted out.${NORMAL}"
180
	fi
181
165
	echo
182
	echo
166
	echo -e "${GOOD}Gentoo Linux${GENTOO_VERS}; ${BRACKET}http://www.gentoo.org/${NORMAL}"
183
	echo -e "${GOOD}Gentoo Linux${GENTOO_VERS}; ${BRACKET}http://www.gentoo.org/${NORMAL}"
167
	echo -e " Copyright 2001-2003 Gentoo Technologies, Inc.; Distributed under the GPL"
184
	echo -e " Copyright 2001-2003 Gentoo Technologies, Inc.; Distributed under the GPL"
(-)functions.sh (-1 / +5 lines)
Lines 440-446 Link Here
440
	else
439
	else
441
		retval="$1"
440
		retval="$1"
442
		
441
		
443
		rc_splash "stop" &>/dev/null &
442
		if [ -c /dev/null ] ; then
443
			rc_splash "stop" &>/dev/null &
444
		else
445
			rc_splash "stop"
446
		fi
444
		
447
		
445
		if [ "$#" -ge 2 ]
448
		if [ "$#" -ge 2 ]
446
		then
449
		then

Return to bug 40987