summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-12-01 15:33:29 +0100
committerChristian Poessinger <christian@poessinger.com>2020-12-01 15:33:29 +0100
commit50a9bf97e193e7f1dcfffa2deea2b6edde112c01 (patch)
tree70316cee83bc36b1195d128d31f20dfdd942551b
parent669969f3f48a680296bb996829f17a3a4676c914 (diff)
downloadvyos-1x-50a9bf97e193e7f1dcfffa2deea2b6edde112c01.tar.gz
vyos-1x-50a9bf97e193e7f1dcfffa2deea2b6edde112c01.zip
dhcpv6: T1433: combine templates for v4 and v6
-rw-r--r--data/templates/dhcp-server/dhcpdv6.conf.tmpl (renamed from data/templates/dhcpv6-server/dhcpdv6.conf.tmpl)0
-rwxr-xr-xsrc/conf_mode/dhcpv6_server.py2
2 files changed, 1 insertions, 1 deletions
diff --git a/data/templates/dhcpv6-server/dhcpdv6.conf.tmpl b/data/templates/dhcp-server/dhcpdv6.conf.tmpl
index aa6d7fb5d..aa6d7fb5d 100644
--- a/data/templates/dhcpv6-server/dhcpdv6.conf.tmpl
+++ b/data/templates/dhcp-server/dhcpdv6.conf.tmpl
diff --git a/src/conf_mode/dhcpv6_server.py b/src/conf_mode/dhcpv6_server.py
index c2868e078..db248de50 100755
--- a/src/conf_mode/dhcpv6_server.py
+++ b/src/conf_mode/dhcpv6_server.py
@@ -390,7 +390,7 @@ def generate(dhcpv6):
if not dhcpv6 or dhcpv6['disabled']:
return None
- render(config_file, 'dhcpv6-server/dhcpdv6.conf.tmpl', dhcpv6)
+ render(config_file, 'dhcp-server/dhcpdv6.conf.tmpl', dhcpv6)
return None
def apply(dhcpv6):