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

Collapse All | Expand All

(-)network-original (-7 / +8 lines)
Lines 65-71 Link Here
65
	Linux)
65
	Linux)
66
		[ -x /sbin/ip ] || return 1
66
		[ -x /sbin/ip ] || return 1
67
		LC_ALL=C ip addr show | while read inet address rest; do
67
		LC_ALL=C ip addr show | while read inet address rest; do
68
	 		case "${inet}" in
68
			case "${inet}" in
69
			inet6)
69
			inet6)
70
				case "${rest}" in
70
				case "${rest}" in
71
				*" "tentative*) return 2;;
71
				*" "tentative*) return 2;;
Lines 74-83 Link Here
74
			esac
74
			esac
75
		done
75
		done
76
		[ $? = 2 ]
76
		[ $? = 2 ]
77
		;;
77
	*)
78
	*)
78
		local inet= address= rest=
79
		local inet= address= rest=
79
		LC_ALL=C ifconfig -a | while read inet address rest; do
80
		LC_ALL=C ifconfig -a | while read inet address rest; do
80
	 		case "${inet}" in
81
			case "${inet}" in
81
			inet6)
82
			inet6)
82
				case "${rest}" in
83
				case "${rest}" in
83
				*" "tentative*) return 2;;
84
				*" "tentative*) return 2;;
Lines 130-136 Link Here
130
	*"$__nl"*)	echo "$@";;
131
	*"$__nl"*)	echo "$@";;
131
	*)
132
	*)
132
		(
133
		(
133
		 	set -o noglob
134
			set -o noglob
134
			IFS=';'; set -- $@
135
			IFS=';'; set -- $@
135
			IFS="$__nl"; echo "$*"
136
			IFS="$__nl"; echo "$*"
136
		);;
137
		);;
Lines 206-212 Link Here
206
		''|"#"*)	;;
207
		''|"#"*)	;;
207
		*)
208
		*)
208
				(
209
				(
209
				 	eval vebegin "${args#*!}"
210
					eval vebegin "${args#*!}"
210
					eval "${args#*!}"
211
					eval "${args#*!}"
211
					veend $?
212
					veend $?
212
				);;
213
				);;
Lines 266-278 Link Here
266
			''|"#"*)	;;
267
			''|"#"*)	;;
267
			"!"*)
268
			"!"*)
268
					(
269
					(
269
					 	eval vebegin "${args#*!}"
270
						eval vebegin "${args#*!}"
270
						eval "${args#*!}"
271
						eval "${args#*!}"
271
						veend $?
272
						veend $?
272
					);;
273
					);;
273
			*)
274
			*)
274
					(
275
					(
275
					 	set -o noglob
276
						set -o noglob
276
						eval set -- "$args"
277
						eval set -- "$args"
277
						vebegin "$@"
278
						vebegin "$@"
278
						$func "$int" "$@"
279
						$func "$int" "$@"
Lines 324-330 Link Here
324
stop()
325
stop()
325
{
326
{
326
	# Don't stop the network at shutdown.
327
	# Don't stop the network at shutdown.
327
 	# We don't use the noshutdown keyword so that we are started again
328
	# We don't use the noshutdown keyword so that we are started again
328
	# correctly if we go back to multiuser.
329
	# correctly if we go back to multiuser.
329
	yesno ${shutdown_network:-YES} && yesno $RC_GOINGDOWN && return 0
330
	yesno ${shutdown_network:-YES} && yesno $RC_GOINGDOWN && return 0
330
331

Return to bug 310805