From 387252e15b083a8eefe2bec7417194fe9b44f471 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 21 Aug 2021 15:12:48 +0200
Subject: pppoe: T3641: set "noipv6" if IPv6 is not configured in newer pppd
 version

---
 data/templates/pppoe/peer.tmpl | 7 +++----
 1 file 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 %}
-- 
cgit v1.2.3