summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-08-21 15:12:48 +0200
committerChristian Poessinger <christian@poessinger.com>2021-08-22 09:40:29 +0200
commit387252e15b083a8eefe2bec7417194fe9b44f471 (patch)
tree69ec99c9d526ff91f799b47acd6dc414350d5879 /data
parentddff5eba85feea2a8d6d24e1914ce6d51ce2ea74 (diff)
downloadvyos-1x-387252e15b083a8eefe2bec7417194fe9b44f471.tar.gz
vyos-1x-387252e15b083a8eefe2bec7417194fe9b44f471.zip
pppoe: T3641: set "noipv6" if IPv6 is not configured in newer pppd version
Diffstat (limited to 'data')
-rw-r--r--data/templates/pppoe/peer.tmpl7
1 files changed, 3 insertions, 4 deletions
diff --git a/data/templates/pppoe/peer.tmpl b/data/templates/pppoe/peer.tmpl
index 7e54e95f3..7803a247d 100644
--- a/data/templates/pppoe/peer.tmpl
+++ b/data/templates/pppoe/peer.tmpl
@@ -58,10 +58,9 @@ mru {{ mtu }}
{{ "usepeerdns" if no_peer_dns is not defined }}
{% if ipv6 is defined %}
-+ipv6
-{% if ipv6.address is defined and ipv6.address.autoconf is defined %}
-ipv6cp-use-ipaddr
-{% endif %}
++ipv6 {{ 'ipv6cp-use-ipaddr' if ipv6.address is defined and ipv6.address.autoconf is defined }}
+{% else %}
+noipv6
{% endif %}
{% if connect_on_demand is defined %}