summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--interface-definitions/dhcp-server.xml.in10
-rw-r--r--interface-definitions/dhcpv6-server.xml.in4
-rw-r--r--interface-definitions/include/dhcp/domain-name.xml.i (renamed from interface-definitions/include/dhcp-domain-name.xml.i)2
-rw-r--r--interface-definitions/include/dhcp/domain-search.xml.i (renamed from interface-definitions/include/dhcp-server-domain-search.xml.i)2
-rw-r--r--interface-definitions/include/dhcp/ping-check.xml.i (renamed from interface-definitions/include/dhcp-ping-check.xml.i)2
5 files changed, 10 insertions, 10 deletions
diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in
index 7ff777c43..4551d75a9 100644
--- a/interface-definitions/dhcp-server.xml.in
+++ b/interface-definitions/dhcp-server.xml.in
@@ -93,8 +93,8 @@
<valueless/>
</properties>
</leafNode>
- #include <include/dhcp-domain-name.xml.i>
- #include <include/dhcp-ping-check.xml.i>
+ #include <include/dhcp/domain-name.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>
@@ -157,8 +157,8 @@
</properties>
</leafNode>
#include <include/name-server-ipv4.xml.i>
- #include <include/dhcp-domain-name.xml.i>
- #include <include/dhcp-server-domain-search.xml.i>
+ #include <include/dhcp/domain-name.xml.i>
+ #include <include/dhcp/domain-search.xml.i>
<leafNode name="enable-failover">
<properties>
<help>Enable DHCP failover support for this subnet</help>
@@ -211,7 +211,7 @@
<multi/>
</properties>
</leafNode>
- #include <include/dhcp-ping-check.xml.i>
+ #include <include/dhcp/ping-check.xml.i>
<leafNode name="pop-server">
<properties>
<help>IP address of POP3 server</help>
diff --git a/interface-definitions/dhcpv6-server.xml.in b/interface-definitions/dhcpv6-server.xml.in
index 18aa53fb8..fb96571f5 100644
--- a/interface-definitions/dhcpv6-server.xml.in
+++ b/interface-definitions/dhcpv6-server.xml.in
@@ -58,7 +58,7 @@
</constraint>
</properties>
</leafNode>
- #include <include/dhcp-server-domain-search.xml.i>
+ #include <include/dhcp/domain-search.xml.i>
#include <include/name-server-ipv6.xml.i>
</children>
</node>
@@ -127,7 +127,7 @@
</tagNode>
</children>
</node>
- #include <include/dhcp-server-domain-search.xml.i>
+ #include <include/dhcp/domain-search.xml.i>
<node name="lease-time">
<properties>
<help>Parameters relating to the lease time</help>
diff --git a/interface-definitions/include/dhcp-domain-name.xml.i b/interface-definitions/include/dhcp/domain-name.xml.i
index eb95596da..410e27d29 100644
--- a/interface-definitions/include/dhcp-domain-name.xml.i
+++ b/interface-definitions/include/dhcp/domain-name.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from dhcp-domain-name.xml.i -->
+<!-- include start from dhcp/domain-name.xml.i -->
<leafNode name="domain-name">
<properties>
<help>Client Domain Name</help>
diff --git a/interface-definitions/include/dhcp-server-domain-search.xml.i b/interface-definitions/include/dhcp/domain-search.xml.i
index 4fc55097b..bcc8fcd12 100644
--- a/interface-definitions/include/dhcp-server-domain-search.xml.i
+++ b/interface-definitions/include/dhcp/domain-search.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from dhcp-server-domain-search.xml.i -->
+<!-- include start from dhcp/domain-search.xml.i -->
<leafNode name="domain-search">
<properties>
<help>Client Domain Name search list</help>
diff --git a/interface-definitions/include/dhcp-ping-check.xml.i b/interface-definitions/include/dhcp/ping-check.xml.i
index 0b2a1214a..a506f68e4 100644
--- a/interface-definitions/include/dhcp-ping-check.xml.i
+++ b/interface-definitions/include/dhcp/ping-check.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from dhcp-ping-check.xml.i -->
+<!-- include start from dhcp/ping-check.xml.i -->
<leafNode name="ping-check">
<properties>
<help>Sends ICMP Echo request to the address being assigned</help>