summaryrefslogtreecommitdiff
path: root/interface-definitions/dhcp-server.xml.in
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-09-18 22:09:05 +0200
committerChristian Poessinger <christian@poessinger.com>2021-09-19 12:32:17 +0200
commitb72fff14c4061e26657835d72e0944229a196940 (patch)
treebeb0695bd2ac9fe34c29d66537defa682c807968 /interface-definitions/dhcp-server.xml.in
parent6e015f3c56f6766a9356120d836b47349470aa1c (diff)
downloadvyos-1x-b72fff14c4061e26657835d72e0944229a196940.tar.gz
vyos-1x-b72fff14c4061e26657835d72e0944229a196940.zip
dhcp-server: T3839: support name-servers and domain config per shared-network
DHCP servers "shared-network" level only makes sense if one can specify configuration items that can be inherited by individual subnets. This is now possible for name-servers and the domain-name. set service dhcp-server shared-network-name LAN domain-name 'vyos.net' set service dhcp-server shared-network-name LAN name-server '192.0.2.1' (cherry picked from commit d411a40a3598c55fae7abd8bc5f1876007aa704b)
Diffstat (limited to 'interface-definitions/dhcp-server.xml.in')
-rw-r--r--interface-definitions/dhcp-server.xml.in12
1 files changed, 3 insertions, 9 deletions
diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in
index 502a07c05..3a2c05698 100644
--- a/interface-definitions/dhcp-server.xml.in
+++ b/interface-definitions/dhcp-server.xml.in
@@ -103,6 +103,8 @@
</properties>
</leafNode>
#include <include/dhcp-ping-check.xml.i>
+ #include <include/dhcp-domain-name.xml.i>
+ #include <include/name-server-ipv4.xml.i>
#include <include/generic-description.xml.i>
#include <include/generic-disable-node.xml.i>
<leafNode name="shared-network-parameters">
@@ -164,15 +166,7 @@
</properties>
</leafNode>
#include <include/name-server-ipv4.xml.i>
- <leafNode name="domain-name">
- <properties>
- <help>Client Domain Name</help>
- <constraint>
- <validator name="fqdn"/>
- </constraint>
- <constraintErrorMessage>Invalid domain name (RFC 1123 section 2).\nMay only contain letters, numbers and .-_</constraintErrorMessage>
- </properties>
- </leafNode>
+ #include <include/dhcp-domain-name.xml.i>
#include <include/dhcp-server-domain-search.xml.i>
<leafNode name="enable-failover">
<properties>