allow the user to override the underlying connection method when using pptp (defaults...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8508 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index c61bdc0..4d03af0 100644 (file)
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -7,11 +7,12 @@ setup_interface_pptp() {
        local config="$2"
        
        config_get device "$config" device
        local config="$2"
        
        config_get device "$config" device

+       config_get ipproto "$config" ipproto

 
        for module in slhc ppp_generic ppp_async ip_gre; do
                /sbin/insmod $module 2>&- >&-
        done
 
        for module in slhc ppp_generic ppp_async ip_gre; do
                /sbin/insmod $module 2>&- >&-
        done

-       setup_interface "$iface" "$config" "dhcp"
+       setup_interface "$iface" "$config" "${ipproto:-dhcp}"

 
        config_get mtu "$cfg" mtu
        config_get server "$cfg" server
 
        config_get mtu "$cfg" mtu
        config_get server "$cfg" server