summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2020-01-25 01:25:24 +0700
committerGitHub <noreply@github.com>2020-01-25 01:25:24 +0700
commitc029e1f2d07354a574818f036b22c8f619c100e1 (patch)
treea35a936cddc22ea2a1d47e03fa02f4bbc5552a3c
parent94bf34511c28a48ae5f548c9f50acf8ef85f5ce6 (diff)
parent9e619702c40763cd9892f2e8ca3d75ae2969ebdb (diff)
downloadvyos-1x-c029e1f2d07354a574818f036b22c8f619c100e1.tar.gz
vyos-1x-c029e1f2d07354a574818f036b22c8f619c100e1.zip
Merge pull request #209 from DmitriyEshenko/pppoe-allow-ipv6
pppoe-server: T1985: Enable ipv6 modules if ipv6 not denied
-rw-r--r--interface-definitions/service-pppoe.xml.in6
-rwxr-xr-xsrc/conf_mode/service-pppoe.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/interface-definitions/service-pppoe.xml.in b/interface-definitions/service-pppoe.xml.in
index bf6023a82..7f93a6e2f 100644
--- a/interface-definitions/service-pppoe.xml.in
+++ b/interface-definitions/service-pppoe.xml.in
@@ -560,6 +560,9 @@
<format>require</format>
<description>Require IPv4 negotiation</description>
</valueHelp>
+ <completionHelp>
+ <list>deny allow prefer require</list>
+ </completionHelp>
</properties>
</leafNode>
<leafNode name="ipv6">
@@ -585,6 +588,9 @@
<format>require</format>
<description>Require IPv6 negotiation</description>
</valueHelp>
+ <completionHelp>
+ <list>deny allow prefer require</list>
+ </completionHelp>
</properties>
</leafNode>
<leafNode name="ipv6-intf-id">
diff --git a/src/conf_mode/service-pppoe.py b/src/conf_mode/service-pppoe.py
index b4a22b1cd..4090cb953 100755
--- a/src/conf_mode/service-pppoe.py
+++ b/src/conf_mode/service-pppoe.py
@@ -49,7 +49,7 @@ pppoe
radius
{% endif %}
ippool
-{% if client_ipv6_pool %}
+{% if ppp_options['ipv6'] != 'deny' %}
ipv6pool
ipv6_nd
ipv6_dhcp