diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-08-30 22:24:30 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-08-30 22:24:30 +0000 |
| commit | d7a58579b4f59c73a3844c20649d6d7483402e58 (patch) | |
| tree | 98b8086a0a9d0958e262ac65fe5d6f8654c92a44 | |
| parent | 3a762f962413fd68ef0ff118d22dec031abcd5ec (diff) | |
fix ifup for pppoa
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1803 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | package/base-files/default/sbin/ifup | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/package/base-files/default/sbin/ifup b/package/base-files/default/sbin/ifup index c46fff65c..1f78061a2 100755 --- a/package/base-files/default/sbin/ifup +++ b/package/base-files/default/sbin/ifup @@ -8,32 +8,34 @@ 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_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>&- + 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) + 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} + 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 + 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) |