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

[openwrt/svn-archive/archive.git] / package / pptp / files / pptp.sh

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index fffa625a2fc561e5b14fe08e1b2ce04510aabca4..4d03af0085e8aa49b5b7028fde9325b8c6bf8aae 100644 (file)
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -7,17 +7,18 @@ setup_interface_pptp() {
        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
-       setup_interface "$iface" "$config" "dhcp"
+       setup_interface "$iface" "$config" "${ipproto:-dhcp}"
 
        config_get mtu "$cfg" mtu
        config_get server "$cfg" server
        mtu=${mtu:-1452}
        start_pppd "$config" \
-               pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd"
-               file /etc/ppp/options.pptp
+               pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd" \
+               file /etc/ppp/options.pptp \
                mtu $mtu mru $mtu
 }