AA: xl2tpd: backport r34537

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_12.09@34539 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/xl2tpd/files/l2tp.sh b/net/xl2tpd/files/l2tp.sh
index b0d5d4c..867234d 100644 (file)
--- a/net/xl2tpd/files/l2tp.sh
+++ b/net/xl2tpd/files/l2tp.sh
@@ -13,8 +13,6 @@ proto_l2tp_init_config() {
        proto_config_add_string "password"
        proto_config_add_string "keepalive"
        proto_config_add_string "pppd_options"
-       proto_config_add_boolean "defaultroute"
-       proto_config_add_boolean "peerdns"
        proto_config_add_boolean "ipv6"
        proto_config_add_int "mtu"
        proto_config_add_string "server"
@@ -45,14 +43,8 @@ proto_l2tp_setup() {
                /etc/init.d/xl2tpd start
        fi
 
-       json_get_vars ipv6 peerdns defaultroute demand keepalive username password pppd_options
+       json_get_vars ipv6 demand keepalive username password pppd_options
        [ "$ipv6" = 1 ] || ipv6=""
-       [ "$peerdns" = 0 ] && peerdns="" || peerdns="1"
-       if [ "$defaultroute" = 1 ]; then
-               defaultroute="defaultroute replacedefaultroute";
-       else
-               defaultroute="nodefaultroute"
-       fi
        if [ "${demand:-0}" -gt 0 ]; then
                demand="precompiled-active-filter /etc/ppp/filter demand idle $demand"
        else
@@ -67,8 +59,8 @@ proto_l2tp_setup() {
        mkdir -p /tmp/l2tp
 
        echo "${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}}" > "${optfile}"
-       echo "${peerdns:+usepeerdns}" >> "${optfile}"
-       echo "$defaultroute" >> "${optfile}"
+       echo "usepeerdns" >> "${optfile}"
+       echo "nodefaultroute" >> "${optfile}"
        echo "${username:+user \"$username\" password \"$password\"}" >> "${optfile}"
        echo "ipparam \"$config\"" >> "${optfile}"
        echo "ifname \"l2tp-$config\"" >> "${optfile}"