X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbase-files%2Fdefault%2Fsbin%2Fifup;h=8ae64166854109bf62e7c8f0e2bf87822b2b1741;hb=23e86550c9c59436cc5f253292774861dd6ca62e;hp=be7075bf146d9064fb500b0336cb27e515673020;hpb=15713b2da9a57d19a4b04af0dd77362c92979966;p=openwrt-10.03%2F.git

diff --git a/package/base-files/default/sbin/ifup b/package/base-files/default/sbin/ifup
index be7075bf1..8ae641668 100755
--- a/package/base-files/default/sbin/ifup
+++ b/package/base-files/default/sbin/ifup
@@ -1,36 +1,34 @@
-#!/bin/ash
+#!/bin/sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
-
 . /etc/functions.sh
 . /etc/network.overrides
 [ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
 
-type=$1
+ifdown $1
+
 debug "### ifup $type ###"
+type=$1
 
 if_proto=$(nvram get ${type}_proto)
 if=$(nvram get ${type}_ifname)
-[ "${if%%[0-9]}" = "ppp" ] && if=$(nvram get ${if_proto}_ifname)
 
-if_valid $if || [ "$if_proto" = "pptp" ] || exit 
-mac=$(nvram get ${type}_hwaddr)
-$DEBUG ifconfig $if down 2>&-
+case "$if_proto" in
+	pppoa) hotplug_dev register atm0; exit 0 ;;
+	pppoe)
+		ifconfig nas0 2>&- >&- || {
+			hotplug_dev register atm0
+			exit 0
+		}
+	;;
+	none|"") exit 0;;
+esac
 
-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}
+[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${type}_device)"
 
+if [ "${if%%[0-9]}" = "br" ]; then
 	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
+		hotplug_dev register "$sif"
 	done
 else
-	${mac:+$DEBUG ifconfig $if down hw ether $mac}
+	hotplug_dev register "$if"
 fi
-
-do_ifup $if_proto $type