aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2005-08-30 22:24:30 +0000
committerFelix Fietkau <nbd@openwrt.org>2005-08-30 22:24:30 +0000
commitec4e62d7dbd0db16f80592211f44e93187417d62 (patch)
tree98b8086a0a9d0958e262ac65fe5d6f8654c92a44
parent363bee365e7d74d55101dc258c6d6c60f12b9843 (diff)
downloadupstream-ec4e62d7dbd0db16f80592211f44e93187417d62.tar.gz
upstream-ec4e62d7dbd0db16f80592211f44e93187417d62.tar.bz2
upstream-ec4e62d7dbd0db16f80592211f44e93187417d62.zip
fix ifup for pppoa
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1803 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/default/sbin/ifup46
1 files changed, 24 insertions, 22 deletions
diff --git a/package/base-files/default/sbin/ifup b/package/base-files/default/sbin/ifup
index c46fff65c3..1f78061a2a 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)