diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-12-04 14:16:14 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-12-04 14:16:14 +0100 |
| commit | 4a64349e3c02cb0c2f2105356d3de39843e45061 (patch) | |
| tree | 2df643aa9ea097d15f196f56b80ff78d2ee6341a /data | |
| parent | a03b8e122cb639876e325603726fbe05c492088e (diff) | |
| download | vyos-1x-4a64349e3c02cb0c2f2105356d3de39843e45061.tar.gz vyos-1x-4a64349e3c02cb0c2f2105356d3de39843e45061.zip | |
pppoe: T3112: drop "ipv6 enable" option
IPv6 enable can be considered once the ipv6 node is present!
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/pppoe/ip-down.script.tmpl | 2 | ||||
| -rw-r--r-- | data/templates/pppoe/peer.tmpl | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/data/templates/pppoe/ip-down.script.tmpl b/data/templates/pppoe/ip-down.script.tmpl index c2d0cd09a..5e119f796 100644 --- a/data/templates/pppoe/ip-down.script.tmpl +++ b/data/templates/pppoe/ip-down.script.tmpl @@ -25,7 +25,7 @@ fi # Always delete default route when interface goes down vtysh -c "conf t" ${VRF_NAME} -c "no ip route 0.0.0.0/0 {{ ifname }} ${VRF_NAME}" -{% if ipv6_enable %} +{% if ipv6 is defined and ipv6.address is defined and ipv6.address.autoconf is defined %} vtysh -c "conf t" ${VRF_NAME} -c "no ipv6 route ::/0 {{ ifname }} ${VRF_NAME}" {% endif %} {% endif %} diff --git a/data/templates/pppoe/peer.tmpl b/data/templates/pppoe/peer.tmpl index dd4272a98..db2cc6188 100644 --- a/data/templates/pppoe/peer.tmpl +++ b/data/templates/pppoe/peer.tmpl @@ -53,9 +53,11 @@ mru {{ mtu }} {{ "usepeerdns" if no_peer_dns is not defined }} -{% if ipv6 is defined and ipv6.enable is defined %} +{% if ipv6 is defined %} +ipv6 +{% if ipv6.address is defined and ipv6.address.autoconf is defined %} ipv6cp-use-ipaddr +{% endif %} {% endif %} {% if service_name is defined %} |