View | Details | Raw Unified | Return to bug 14810 | Differences between
and this patch

Collapse All | Expand All

(-)/etc/rc.network (-11 / +19 lines)
Lines 77-87 Link Here
77
		;;
77
		;;
78
	esac
78
	esac
79
79
80
	dhcp_interfaces=""
80
	for ifn in ${network_interfaces}; do
81
	for ifn in ${network_interfaces}; do
81
		showstat=false
82
		if [ -r /etc/start_if.${ifn} ]; then
82
		if [ -r /etc/start_if.${ifn} ]; then
83
			. /etc/start_if.${ifn}
83
			. /etc/start_if.${ifn}
84
			showstat=true
84
			eval showstat_$ifn=1
85
		fi
85
		fi
86
86
87
		# Do the primary ifconfig if specified
87
		# Do the primary ifconfig if specified
Lines 92-106 Link Here
92
		'')
92
		'')
93
			;;
93
			;;
94
		[Dd][Hh][Cc][Pp])
94
		[Dd][Hh][Cc][Pp])
95
			${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${ifn}
95
			# DHCP inits are done all in one go below
96
			showstat=true
96
			dhcp_interfaces="$dhcp_interfaces $ifn"
97
			eval showstat_$ifn=1
97
			;;
98
			;;
98
		*)
99
		*)
99
			ifconfig ${ifn} ${ifconfig_args}
100
			ifconfig ${ifn} ${ifconfig_args}
100
			showstat=true
101
			eval showstat_$ifn=1
101
			;;
102
			;;
102
		esac
103
		esac
104
	done
105
106
	if [ ! -z "${dhcp_interfaces}" ]; then
107
		${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${dhcp_interfaces}
108
	fi
103
109
110
	for ifn in ${network_interfaces}; do
104
		# Check to see if aliases need to be added
111
		# Check to see if aliases need to be added
105
		#
112
		#
106
		alias=0
113
		alias=0
Lines 108-114 Link Here
108
			eval ifconfig_args=\$ifconfig_${ifn}_alias${alias}
115
			eval ifconfig_args=\$ifconfig_${ifn}_alias${alias}
109
			if [ -n "${ifconfig_args}" ]; then
116
			if [ -n "${ifconfig_args}" ]; then
110
				ifconfig ${ifn} ${ifconfig_args} alias
117
				ifconfig ${ifn} ${ifconfig_args} alias
111
				showstat=true
118
				eval showstat_$ifn=1
112
				alias=`expr ${alias} + 1`
119
				alias=`expr ${alias} + 1`
113
			else
120
			else
114
				break;
121
				break;
Lines 120-133 Link Here
120
		eval ifconfig_args=\$ifconfig_${ifn}_ipx
127
		eval ifconfig_args=\$ifconfig_${ifn}_ipx
121
		if [ -n "${ifconfig_args}" ]; then
128
		if [ -n "${ifconfig_args}" ]; then
122
			ifconfig ${ifn} ${ifconfig_args}
129
			ifconfig ${ifn} ${ifconfig_args}
123
			showstat=true
130
			eval showstat_$ifn=1
124
		fi
131
		fi
132
	done
125
133
126
		case ${showstat} in
134
	for ifn in ${network_interfaces}; do
127
		true)
135
		eval showstat=\$showstat_${ifn}
136
		if [ ! -z ${showstat} ]; then
128
			ifconfig ${ifn}
137
			ifconfig ${ifn}
129
			;;
138
		fi
130
		esac
131
	done
139
	done
132
140
133
	# Warm up user ppp if required, must happen before natd.
141
	# Warm up user ppp if required, must happen before natd.

Return to bug 14810