From b121ee14ff1961b56568b0116de3c246ea4af934 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 21 Aug 2021 11:35:07 +0200
Subject: pppoe: T1318: implement missing access-concentrator CLI option

---
 data/templates/pppoe/peer.tmpl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'data/templates')

diff --git a/data/templates/pppoe/peer.tmpl b/data/templates/pppoe/peer.tmpl
index e8fda2cae..7e54e95f3 100644
--- a/data/templates/pppoe/peer.tmpl
+++ b/data/templates/pppoe/peer.tmpl
@@ -1,8 +1,5 @@
 ### Autogenerated by interfaces-pppoe.py ###
-
-{% if description %}
-# {{ description }}
-{% endif %}
+{{ '# ' ~ description if description is defined else '' }}
 
 # Require peer to provide the local IP address if it is not
 # specified explicitly in the config file.
@@ -38,6 +35,13 @@ noproxyarp
 maxfail 0
 
 plugin rp-pppoe.so
+{% if access_concentrator is defined and access_concentrator is not none %}
+rp_pppoe_ac '{{ access_concentrator }}'
+{% endif %}
+{% if service_name is defined and service_name is not none %}
+rp_pppoe_service '{{ service_name }}'
+{% endif %}
+
 {{ source_interface }}
 persist
 ifname {{ ifname }}
@@ -60,10 +64,6 @@ ipv6cp-use-ipaddr
 {%   endif %}
 {% endif %}
 
-{% if service_name is defined %}
-rp_pppoe_service "{{ service_name }}"
-{% endif %}
-
 {% if connect_on_demand is defined %}
 demand
 # See T2249. PPP default route options should only be set when in on-demand
-- 
cgit v1.2.3