[backfire] merge r28368

[openwrt-10.03/.git] / package / ppp / files / pppoe.sh

diff --git a/package/ppp/files/pppoe.sh b/package/ppp/files/pppoe.sh
index f33d37a1a84a54b7e018d28da82e0db0eb7247d6..ea3dc6cf01264239e041367f11c5f6feaf1def36 100644 (file)
--- a/package/ppp/files/pppoe.sh
+++ b/package/ppp/files/pppoe.sh
@@ -1,24 +1,30 @@
-scan_pppoe() {
-       scan_ppp "$@"
+stop_interface_pppoe() {
+       stop_interface_ppp "$1"
 }
 
 setup_interface_pppoe() {
        local iface="$1"
        local config="$2"
-       
+
        for module in slhc ppp_generic pppox pppoe; do
                /sbin/insmod $module 2>&- >&-
        done
 
-       # make sure the network state references the correct ifname
-       scan_ppp "$config"
-       config_get ifname "$config" ifname
-       uci set "/var/state/network.$config.ifname=$ifname"
+       local mtu
+       config_get mtu "$config" mtu 1492
+
+       local ac
+       config_get ac "$config" ac
+
+       local service
+       config_get service "$config" service
 
-       config_get mtu "$cfg" mtu
-       mtu=${mtu:-1492}
+       # NB: the first nic-* argument will be moved to the
+       #     end of the argument list by start_pppd()
        start_pppd "$config" \
+               "nic-$iface" \
                plugin rp-pppoe.so \
-               mtu $mtu mru $mtu \
-               "nic-$iface"
+               ${ac:+rp_pppoe_ac "$ac"} \
+               ${service:+rp_pppoe_service "$service"} \
+               mtu $mtu mru $mtu
 }