X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/3d007394805916ceb2214bfd7e06d8a4899262c5..66492b44df29654379584aac27a0d0c84b26cade:/openwrt/package/base-files/default/sbin/ifup

diff --git a/openwrt/package/base-files/default/sbin/ifup b/openwrt/package/base-files/default/sbin/ifup
index 3d81364d0..1f78061a2 100755
--- a/openwrt/package/base-files/default/sbin/ifup
+++ b/openwrt/package/base-files/default/sbin/ifup
@@ -1,33 +1,41 @@
 #!/bin/ash
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
+. /etc/network.overrides
+[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
+
 type=$1
 debug "### ifup $type ###"
 
 if_proto=$(nvram get ${type}_proto)
-if=$(nvram get ${type}_ifname)
-[ "${if%%[0-9]}" = "ppp" ] && if=$(nvram get ${if_proto}_ifname)
-
-if_valid $if || exit 
-mac=$(nvram get ${type}_hwaddr)
-$DEBUG ifconfig $if down 2>&-
-
-if [ "${if%%[0-9]}" = "br" ]; then
-	stp=$(nvram get ${type}_stp)
-	$DEBUG brctl delbr $if 2>&-
-	$DEBUG brctl addbr $if
-	$DEBUG brctl setfd $if 0
-	$DEBUG brctl stp $if ${stp:-0}
-
-	for sif in $(nvram get ${type}_ifnames); do
-		if_valid $sif || continue
-		${mac:+$DEBUG ifconfig $sif down hw ether $mac}
-		$DEBUG ifconfig $sif 0.0.0.0 up
-		$DEBUG brctl addif $if $sif
-	done
-else
-	${mac:+$DEBUG ifconfig $if down hw ether $mac}
-fi
+[ "${if_proto}" = "pppoa" ] || {
+	if=$(nvram get ${type}_ifname)
+	[ "${if%%[0-9]}" = "ppp" ] && if=$(nvram get ${if_proto}_ifname)
+
+	if_valid $if || exit 
+	mac=$(nvram get ${type}_hwaddr)
+	$DEBUG ifconfig $if down 2>&-
+
+	pidfile=/var/run/${if}.pid
+	[ -f $pidfile ] && $DEBUG kill $(cat $pidfile)
+
+	if [ "${if%%[0-9]}" = "br" ]; then
+		stp=$(nvram get ${type}_stp)
+		$DEBUG brctl delbr $if 2>&-
+		$DEBUG brctl addbr $if
+		$DEBUG brctl setfd $if 0
+		$DEBUG brctl stp $if ${stp:-0}
+
+		for sif in $(nvram get ${type}_ifnames); do
+			if_valid $sif || continue
+			${mac:+$DEBUG ifconfig $sif down hw ether $mac}
+			$DEBUG ifconfig $sif 0.0.0.0 up
+			$DEBUG brctl addif $if $sif
+		done
+	else
+		${mac:+$DEBUG ifconfig $if down hw ether $mac}
+	fi
+}
 
 case "$if_proto" in
 	static)
@@ -47,7 +55,6 @@ case "$if_proto" in
 	;;
 	dhcp)
 		ip=$(nvram get ${type}_ipaddr)
-		[ -f $pidfile ] && $DEBUG kill $(cat $pidfile)
 		${DEBUG:-eval} "udhcpc -R -i $if ${ip:+-r $ip} -b -p $pidfile &" 
 	;;
 	none|"")