Attachment #3371 for bug #19152

View | Details | Raw Unified | Return to bug 19152
Collapse All | Expand All

Lines 144-149 if iface_is_up $NAME; then Link Here

(-)a/etc/net/scripts/ifdown (+6 lines)
144	ExecIfExecutable $LOCALSCRIPTDIR/ifdown-pre-local $NAME && print_progress	144	ExecIfExecutable $LOCALSCRIPTDIR/ifdown-pre-local $NAME && print_progress
145	ExecIfExecutable $MYIFACEDIR/ifdown-pre $NAME && print_progress	145	ExecIfExecutable $MYIFACEDIR/ifdown-pre $NAME && print_progress
146	$IP link set dev $NAME down && print_progress	146	$IP link set dev $NAME down && print_progress
		147	# handle resolver config
		148	MYRESOLVCONF=`profiled_filename $MYIFACEDIR/resolv.conf`
		149	if [ -s $MYRESOLVCONF -a -x "${RESOLVCONFTOOL:=$DEFAULT_RESOLVCONFTOOL}" ]; then
		150	$RESOLVCONFTOOL -d $NAME
		151	print_progress
		152	fi
147	fi	153	fi
148	ExecIfExecutable $LOCALSCRIPTDIR/ifdown-post-local $NAME && print_progress	154	ExecIfExecutable $LOCALSCRIPTDIR/ifdown-post-local $NAME && print_progress
149	ExecIfExecutable $MYIFACEDIR/ifdown-post $NAME && print_progress	155	ExecIfExecutable $MYIFACEDIR/ifdown-post $NAME && print_progress




is_yes "$CONFIG_QOS"  && $SCRIPTDIR/config-qos $NAME start "${IPV4ADDRESS[*]}" "${IPV6ADDRESS[*]}"


# handle resolver config
MYRESOLVCONF=`profiled_filename $MYIFACEDIR/resolv.conf`
if [ -s $MYRESOLVCONF ]; then
	rm -f /etc/resolv.conf
	cp $MYRESOLVCONF /etc/resolv.conf
	[ -x "$RESOLV_POSTIN_CMD" ] && $RESOLV_POSTIN_CMD $RESOLV_POSTIN_ARGS
	print_progress
fi

# handle sysctl file
GLOBAL_SYSCTL=`profiled_filename $IFACEDIR/sysctl.conf`
TYPESPEC_SYSCTL=`profiled_filename $IFACEDIR/default/sysctl.conf-$TYPE`


# ifup-post
iface_is_up $NAME && {
# handle resolver config
	MYRESOLVCONF=`profiled_filename $MYIFACEDIR/resolv.conf`
	if [ -s $MYRESOLVCONF ]; then
		if [ -x "${RESOLVCONFTOOL:=$DEFAULT_RESOLVCONFTOOL}" ]; then
			$RESOLVCONFTOOL -a $NAME < $MYRESOLVCONF
		else
			rm -f /etc/resolv.conf
			cp $MYRESOLVCONF /etc/resolv.conf
			[ -x "$RESOLV_POSTIN_CMD" ] && $RESOLV_POSTIN_CMD $RESOLV_POSTIN_ARGS
		fi
		print_progress
	fi
	ExecIfExecutable $LOCALSCRIPTDIR/ifup-post-local $NAME && print_progress
	ExecIfExecutable $MYIFACEDIR/ifup-post $NAME && print_progress
}

Return to bug 19152

Lines 232-246 is_yes "$CONFIG_FW" && $SCRIPTDIR/config-fw $NAME start "${IPV4ADDRESS[*]}" "$ Link Here

(-)a/etc/net/scripts/ifup-common (-9 / +12 lines)
232	is_yes "$CONFIG_QOS" && $SCRIPTDIR/config-qos $NAME start "${IPV4ADDRESS[]}" "${IPV6ADDRESS[]}"	232	is_yes "$CONFIG_QOS" && $SCRIPTDIR/config-qos $NAME start "${IPV4ADDRESS[]}" "${IPV6ADDRESS[]}"
233		233
234		234
235	# handle resolver config
236	MYRESOLVCONF=`profiled_filename $MYIFACEDIR/resolv.conf`
237	if [ -s $MYRESOLVCONF ]; then
238	rm -f /etc/resolv.conf
239	cp $MYRESOLVCONF /etc/resolv.conf
240	[ -x "$RESOLV_POSTIN_CMD" ] && $RESOLV_POSTIN_CMD $RESOLV_POSTIN_ARGS
241	print_progress
242	fi
243
244	# handle sysctl file	235	# handle sysctl file
245	GLOBAL_SYSCTL=`profiled_filename $IFACEDIR/sysctl.conf`	236	GLOBAL_SYSCTL=`profiled_filename $IFACEDIR/sysctl.conf`
246	TYPESPEC_SYSCTL=`profiled_filename $IFACEDIR/default/sysctl.conf-$TYPE`	237	TYPESPEC_SYSCTL=`profiled_filename $IFACEDIR/default/sysctl.conf-$TYPE`
Lines 254-259 ExecIfExecutable $SCRIPTDIR/setup-$TYPE $NAME && print_progress Link Here
254		245
255	# ifup-post	246	# ifup-post
256	iface_is_up $NAME && {	247	iface_is_up $NAME && {
		248	# handle resolver config
		249	MYRESOLVCONF=`profiled_filename $MYIFACEDIR/resolv.conf`
		250	if [ -s $MYRESOLVCONF ]; then
		251	if [ -x "${RESOLVCONFTOOL:=$DEFAULT_RESOLVCONFTOOL}" ]; then
		252	$RESOLVCONFTOOL -a $NAME < $MYRESOLVCONF
		253	else
		254	rm -f /etc/resolv.conf
		255	cp $MYRESOLVCONF /etc/resolv.conf
		256	[ -x "$RESOLV_POSTIN_CMD" ] && $RESOLV_POSTIN_CMD $RESOLV_POSTIN_ARGS
		257	fi
		258	print_progress
		259	fi
257	ExecIfExecutable $LOCALSCRIPTDIR/ifup-post-local $NAME && print_progress	260	ExecIfExecutable $LOCALSCRIPTDIR/ifup-post-local $NAME && print_progress
258	ExecIfExecutable $MYIFACEDIR/ifup-post $NAME && print_progress	261	ExecIfExecutable $MYIFACEDIR/ifup-post $NAME && print_progress
259	}	262	}

Lines 27-32 DEFAULT_IFENSLAVE=/sbin/ifenslave Link Here

(-)a/etc/net/scripts/functions (-1 / +2 lines)
27	DEFAULT_TUNCTL=/usr/sbin/tunctl	27	DEFAULT_TUNCTL=/usr/sbin/tunctl
28	DEFAULT_BRCTL=/usr/sbin/brctl	28	DEFAULT_BRCTL=/usr/sbin/brctl
29	DEFAULT_ETHTOOL=/usr/sbin/ethtool	29	DEFAULT_ETHTOOL=/usr/sbin/ethtool
		30	DEFAULT_RESOLVCONFTOOL=/sbin/resolvconf
30	DEFAULT_PPPD=/usr/sbin/pppd	31	DEFAULT_PPPD=/usr/sbin/pppd
31	DEFAULT_CHAT=/usr/sbin/chat	32	DEFAULT_CHAT=/usr/sbin/chat
32	DEFAULT_PPPOPTIONSFILE=pppoptions	33	DEFAULT_PPPOPTIONSFILE=pppoptions
Lines 559-565 declare -rx VLANTAB HOSTTAB IFTAB PROFILE_FILE PROC_CMDLINE DEFAULT_IFPLUGSTATUS Link Here
559	declare -rx DEFAULT_IFPLUGD DEFAULT_IWCONFIG DEFAULT_WLANCONFIG DEFAULT_WPA_SUPPLICANT DEFAULT_WPA_CLI DEFAULT_PLIPCONFIG	560	declare -rx DEFAULT_IFPLUGD DEFAULT_IWCONFIG DEFAULT_WLANCONFIG DEFAULT_WPA_SUPPLICANT DEFAULT_WPA_CLI DEFAULT_PLIPCONFIG
560	declare -rx DEFAULT_IWPRIV DEFAULT_VCONFIG DEFAULT_PENTANETT DEFAULT_PENTAVALT DEFAULT_PENTANET_CONF	561	declare -rx DEFAULT_IWPRIV DEFAULT_VCONFIG DEFAULT_PENTANETT DEFAULT_PENTAVALT DEFAULT_PENTANET_CONF
561	declare -rx DEFAULT_PENTAVAL_CONF DEFAULT_IPSECADM DEFAULT_IFENSLAVE DEFAULT_BRCTL	562	declare -rx DEFAULT_PENTAVAL_CONF DEFAULT_IPSECADM DEFAULT_IFENSLAVE DEFAULT_BRCTL
562	declare -rx DEFAULT_ETHTOOL DEFAULT_PPPD DEFAULT_CHAT DEFAULT_PPPOPTIONSFILE	563	declare -rx DEFAULT_ETHTOOL DEFAULT_RESOLVCONFTOOL DEFAULT_PPPD DEFAULT_CHAT DEFAULT_PPPOPTIONSFILE
563	declare -rx DEFAULT_PPPINITCHAT DEFAULT_PPPCONNECTCHAT DEFAULT_PPPDISCONNECTCHAT	564	declare -rx DEFAULT_PPPINITCHAT DEFAULT_PPPCONNECTCHAT DEFAULT_PPPDISCONNECTCHAT
564	declare -rx DEFAULT_CHATOPTIONS DEFAULT_PPPOE DEFAULT_PPPOEOPTIONS DEFAULT_PPTP	565	declare -rx DEFAULT_CHATOPTIONS DEFAULT_PPPOE DEFAULT_PPPOEOPTIONS DEFAULT_PPTP
565	declare -rx DEFAULT_SZAP DEFAULT_SZAP_ARGS DEFAULT_DVBNET DEFAULT_PAND	566	declare -rx DEFAULT_SZAP DEFAULT_SZAP_ARGS DEFAULT_DVBNET DEFAULT_PAND