diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-09-21 20:01:21 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-09-21 22:12:49 +0200 |
| commit | 10a71d6d0534810c314010adc22ae7265334647c (patch) | |
| tree | d8870a3f5a053c036356b44b037322375678b384 /interface-definitions | |
| parent | 6fe3f5ad74456065bb841d89aa11f126243eeaab (diff) | |
| download | vyos-1x-10a71d6d0534810c314010adc22ae7265334647c.tar.gz vyos-1x-10a71d6d0534810c314010adc22ae7265334647c.zip | |
dhcp-server: T3839: support domain-search and ntp-server config per shared-network
(cherry picked from commit 689d1824d251ea9fbd81bf0c941dbd36e33ef420)
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/dhcp-server.xml.in | 21 | ||||
| -rw-r--r-- | interface-definitions/include/dhcp/ntp-server.xml.i | 15 |
2 files changed, 21 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> diff --git a/interface-definitions/include/dhcp/ntp-server.xml.i b/interface-definitions/include/dhcp/ntp-server.xml.i new file mode 100644 index 000000000..32d8207e5 --- /dev/null +++ b/interface-definitions/include/dhcp/ntp-server.xml.i @@ -0,0 +1,15 @@ +<!-- include start from dhcp/ntp-server.xml.i --> + <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 end --> |