summaryrefslogtreecommitdiff
path: root/interface-definitions/dhcp-server.xml.in
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-09-21 20:01:21 +0200
committerChristian Poessinger <christian@poessinger.com>2021-09-21 20:01:21 +0200
commit689d1824d251ea9fbd81bf0c941dbd36e33ef420 (patch)
treeaf2dccf193a3bf7f8034204adb4286d85b130ade /interface-definitions/dhcp-server.xml.in
parent7a5edd23864f5eb4d8c40e4e35212d88796656e1 (diff)
downloadvyos-1x-689d1824d251ea9fbd81bf0c941dbd36e33ef420.tar.gz
vyos-1x-689d1824d251ea9fbd81bf0c941dbd36e33ef420.zip
dhcp-server: T3839: support domain-search and ntp-server config per shared-network
Diffstat (limited to 'interface-definitions/dhcp-server.xml.in')
-rw-r--r--interface-definitions/dhcp-server.xml.in21
1 files changed, 6 insertions, 15 deletions
diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in
index 2707ce96d..47bdc4db1 100644
--- a/interface-definitions/dhcp-server.xml.in
+++ b/interface-definitions/dhcp-server.xml.in
@@ -103,10 +103,12 @@
</properties>
</leafNode>
#include <include/dhcp/domain-name.xml.i>
+ #include <include/dhcp/domain-search.xml.i>
+ #include <include/dhcp/ntp-server.xml.i>
#include <include/dhcp/ping-check.xml.i>
- #include <include/name-server-ipv4.xml.i>
#include <include/generic-description.xml.i>
#include <include/generic-disable-node.xml.i>
+ #include <include/name-server-ipv4.xml.i>
<leafNode name="shared-network-parameters">
<properties>
<help>Additional shared-network parameters for DHCP server.
@@ -165,9 +167,10 @@
</constraint>
</properties>
</leafNode>
- #include <include/name-server-ipv4.xml.i>
#include <include/dhcp/domain-name.xml.i>
#include <include/dhcp/domain-search.xml.i>
+ #include <include/generic-description.xml.i>
+ #include <include/name-server-ipv4.xml.i>
<leafNode name="enable-failover">
<properties>
<help>Enable DHCP failover support for this subnet</help>
@@ -207,19 +210,7 @@
</properties>
<defaultValue>86400</defaultValue>
</leafNode>
- <leafNode name="ntp-server">
- <properties>
- <help>IP address of NTP server</help>
- <valueHelp>
- <format>ipv4</format>
- <description>NTP server IPv4 address</description>
- </valueHelp>
- <constraint>
- <validator name="ipv4-address"/>
- </constraint>
- <multi/>
- </properties>
- </leafNode>
+ #include <include/dhcp/ntp-server.xml.i>
#include <include/dhcp/ping-check.xml.i>
<leafNode name="pop-server">
<properties>