Changeset 34539


Ignore:
Timestamp:
2012-12-06T19:22:53+01:00 (5 years ago)
Author:
jow
Message:

AA: xl2tpd: backport r34537

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_12.09/net/xl2tpd/files/l2tp.sh

    r32575 r34539  
    1414        proto_config_add_string "keepalive" 
    1515        proto_config_add_string "pppd_options" 
    16         proto_config_add_boolean "defaultroute" 
    17         proto_config_add_boolean "peerdns" 
    1816        proto_config_add_boolean "ipv6" 
    1917        proto_config_add_int "mtu" 
     
    4644        fi 
    4745 
    48         json_get_vars ipv6 peerdns defaultroute demand keepalive username password pppd_options 
     46        json_get_vars ipv6 demand keepalive username password pppd_options 
    4947        [ "$ipv6" = 1 ] || ipv6="" 
    50         [ "$peerdns" = 0 ] && peerdns="" || peerdns="1" 
    51         if [ "$defaultroute" = 1 ]; then 
    52                 defaultroute="defaultroute replacedefaultroute"; 
    53         else 
    54                 defaultroute="nodefaultroute" 
    55         fi 
    5648        if [ "${demand:-0}" -gt 0 ]; then 
    5749                demand="precompiled-active-filter /etc/ppp/filter demand idle $demand" 
     
    6860 
    6961        echo "${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}}" > "${optfile}" 
    70         echo "${peerdns:+usepeerdns}" >> "${optfile}" 
    71         echo "$defaultroute" >> "${optfile}" 
     62        echo "usepeerdns" >> "${optfile}" 
     63        echo "nodefaultroute" >> "${optfile}" 
    7264        echo "${username:+user \"$username\" password \"$password\"}" >> "${optfile}" 
    7365        echo "ipparam \"$config\"" >> "${optfile}" 
Note: See TracChangeset for help on using the changeset viewer.