diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-12-23 11:36:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-23 11:36:32 +0000 |
| commit | 1258853a124780117967271ac5fa13bfaa024848 (patch) | |
| tree | 8e51189995373d16eee6cdcf86dd868368703f62 | |
| parent | 3168305a0474573ad0f36fee399baa423cbce5e4 (diff) | |
| parent | 8f61e4293945ea895385a29f8bd387cde9f98806 (diff) | |
| download | vyos-1x-1258853a124780117967271ac5fa13bfaa024848.tar.gz vyos-1x-1258853a124780117967271ac5fa13bfaa024848.zip | |
Merge pull request #4247 from sever-sever/T6936
T6936: PPPoE-server add option combined to interface
| -rw-r--r-- | data/templates/accel-ppp/pppoe.config.j2 | 3 | ||||
| -rw-r--r-- | interface-definitions/service_pppoe-server.xml.in | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/data/templates/accel-ppp/pppoe.config.j2 b/data/templates/accel-ppp/pppoe.config.j2 index cf952c687..2c4871a6b 100644 --- a/data/templates/accel-ppp/pppoe.config.j2 +++ b/data/templates/accel-ppp/pppoe.config.j2 @@ -61,6 +61,9 @@ interface={{ iface }} {% for vlan in iface_config.vlan %} interface=re:^{{ iface }}\.{{ vlan | range_to_regex }}$ {% endfor %} +{% if iface_config.combined is vyos_defined %} +interface={{ iface }} +{% endif %} {% if iface_config.vlan_mon is vyos_defined %} vlan-mon={{ iface }},{{ iface_config.vlan | join(',') }} {% endif %} diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in index 0c99fd261..32215e9d2 100644 --- a/interface-definitions/service_pppoe-server.xml.in +++ b/interface-definitions/service_pppoe-server.xml.in @@ -63,6 +63,12 @@ </completionHelp> </properties> <children> + <leafNode name="combined"> + <properties> + <help>Listen on both VLANs and the base interface</help> + <valueless/> + </properties> + </leafNode> #include <include/accel-ppp/vlan.xml.i> #include <include/accel-ppp/vlan-mon.xml.i> </children> |