add fixes for the pptp network scripts

SVN-Revision: 4835

diff --git a/openwrt/package/ppp/files/pptp.sh b/openwrt/package/ppp/files/pptp.sh
deleted file mode 100644 (file)
index 7b33ac1..0000000
--- a/openwrt/package/ppp/files/pptp.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-scan_pptp() {
-       scan_ppp "$@"
-}

diff --git a/openwrt/package/pptp/files/pptp.sh b/openwrt/package/pptp/files/pptp.sh
index 7847802041bfae1bdd7da759f3618f4ca27ece90..fffa625a2fc561e5b14fe08e1b2ce04510aabca4 100644 (file)
--- a/openwrt/package/pptp/files/pptp.sh
+++ b/openwrt/package/pptp/files/pptp.sh
@@ -1,8 +1,8 @@
-scan_pppoe() {
+scan_pptp() {
        scan_ppp "$@"
 }
 
-setup_interface_pppoe() {
+setup_interface_pptp() {
        local iface="$1"
        local config="$2"
        
@@ -14,9 +14,10 @@ setup_interface_pppoe() {
        setup_interface "$iface" "$config" "dhcp"
 
        config_get mtu "$cfg" mtu
+       config_get server "$cfg" server
        mtu=${mtu:-1452}
        start_pppd "$config" \
-               plugin rp-pppoe.so \
-               mtu $mtu mru $mtu \
-               "nic-$device"
+               pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd"
+               file /etc/ppp/options.pptp
+               mtu $mtu mru $mtu
 }