[package] ppp: move the rp_pppoe_* options behind the plugin argument

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

diff --git a/package/ppp/files/pppoe.sh b/package/ppp/files/pppoe.sh
index e1c9a20..ea3dc6c 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"
 }
 
 setup_interface_pppoe() {
        local iface="$1"
        local config="$2"

-       
+

        for module in slhc ppp_generic pppox pppoe; do
                /sbin/insmod $module 2>&- >&-
        done
 
        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
-       set_interface_ifname "$config" "$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" \
        start_pppd "$config" \

+               "nic-$iface" \

                plugin rp-pppoe.so \
                plugin rp-pppoe.so \

-               mtu $mtu mru $mtu \
-               "nic-$iface"
+               ${ac:+rp_pppoe_ac "$ac"} \
+               ${service:+rp_pppoe_service "$service"} \
+               mtu $mtu mru $mtu

 }
 }