diff options
| -rw-r--r-- | interface-definitions/include/dhcp-options.xml.i (renamed from interface-definitions/include/dhcp-dhcpv6-options.xml.i) | 19 | ||||
| -rw-r--r-- | interface-definitions/include/dhcpv6-options.xml.i | 19 | ||||
| -rw-r--r-- | interface-definitions/include/vif-s.xml.i | 6 | ||||
| -rw-r--r-- | interface-definitions/include/vif.xml.i | 3 | ||||
| -rw-r--r-- | interface-definitions/interfaces-bonding.xml.in | 3 | ||||
| -rw-r--r-- | interface-definitions/interfaces-bridge.xml.in | 3 | ||||
| -rw-r--r-- | interface-definitions/interfaces-ethernet.xml.in | 3 | ||||
| -rw-r--r-- | interface-definitions/interfaces-pseudo-ethernet.xml.in | 3 | ||||
| -rw-r--r-- | interface-definitions/interfaces-wireless.xml.in | 3 |
9 files changed, 35 insertions, 27 deletions
diff --git a/interface-definitions/include/dhcp-dhcpv6-options.xml.i b/interface-definitions/include/dhcp-options.xml.i index e4387863b..0f71d9321 100644 --- a/interface-definitions/include/dhcp-dhcpv6-options.xml.i +++ b/interface-definitions/include/dhcp-options.xml.i @@ -20,22 +20,3 @@ </leafNode> </children> </node> -<node name="dhcpv6-options"> - <properties> - <help>DHCPv6 options</help> - </properties> - <children> - <leafNode name="parameters-only"> - <properties> - <help>Acquire only config parameters, no address</help> - <valueless/> - </properties> - </leafNode> - <leafNode name="temporary"> - <properties> - <help>IPv6 "temporary" address</help> - <valueless/> - </properties> - </leafNode> - </children> -</node> diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i new file mode 100644 index 000000000..c55a5271f --- /dev/null +++ b/interface-definitions/include/dhcpv6-options.xml.i @@ -0,0 +1,19 @@ +<node name="dhcpv6-options"> + <properties> + <help>DHCPv6 options</help> + </properties> + <children> + <leafNode name="parameters-only"> + <properties> + <help>Acquire only config parameters, no address</help> + <valueless/> + </properties> + </leafNode> + <leafNode name="temporary"> + <properties> + <help>IPv6 "temporary" address</help> + <valueless/> + </properties> + </leafNode> + </children> +</node> diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i index ab2dcd955..a6d7c81ce 100644 --- a/interface-definitions/include/vif-s.xml.i +++ b/interface-definitions/include/vif-s.xml.i @@ -9,7 +9,8 @@ <children> #include <include/address-ipv4-ipv6-dhcp.xml.i> #include <include/interface-description.xml.i> - #include <include/dhcp-dhcpv6-options.xml.i> + #include <include/dhcp-options.xml.i> + #include <include/dhcpv6-options.xml.i> #include <include/interface-disable-link-detect.xml.i> #include <include/interface-disable.xml.i> <leafNode name="ethertype"> @@ -53,7 +54,8 @@ <children> #include <include/address-ipv4-ipv6-dhcp.xml.i> #include <include/interface-description.xml.i> - #include <include/dhcp-dhcpv6-options.xml.i> + #include <include/dhcp-options.xml.i> + #include <include/dhcpv6-options.xml.i> #include <include/interface-disable-link-detect.xml.i> #include <include/interface-disable.xml.i> #include <include/interface-mac.xml.i> diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i index 819534dc1..5a4e52122 100644 --- a/interface-definitions/include/vif.xml.i +++ b/interface-definitions/include/vif.xml.i @@ -13,7 +13,8 @@ <children> #include <include/address-ipv4-ipv6-dhcp.xml.i> #include <include/interface-description.xml.i> - #include <include/dhcp-dhcpv6-options.xml.i> + #include <include/dhcp-options.xml.i> + #include <include/dhcpv6-options.xml.i> #include <include/interface-disable-link-detect.xml.i> #include <include/interface-disable.xml.i> #include <include/interface-vrf.xml.i> diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in index 07a6abd30..ddd52979b 100644 --- a/interface-definitions/interfaces-bonding.xml.in +++ b/interface-definitions/interfaces-bonding.xml.in @@ -50,7 +50,8 @@ </children> </node> #include <include/interface-description.xml.i> - #include <include/dhcp-dhcpv6-options.xml.i> + #include <include/dhcp-options.xml.i> + #include <include/dhcpv6-options.xml.i> #include <include/interface-disable-link-detect.xml.i> #include <include/interface-disable.xml.i> #include <include/interface-vrf.xml.i> diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in index 818bc9c0e..6b610e623 100644 --- a/interface-definitions/interfaces-bridge.xml.in +++ b/interface-definitions/interfaces-bridge.xml.in @@ -34,7 +34,8 @@ </properties> </leafNode> #include <include/interface-description.xml.i> - #include <include/dhcp-dhcpv6-options.xml.i> + #include <include/dhcp-options.xml.i> + #include <include/dhcpv6-options.xml.i> #include <include/interface-disable-link-detect.xml.i> #include <include/interface-disable.xml.i> #include <include/interface-vrf.xml.i> diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in index 89669f966..1e32a15f8 100644 --- a/interface-definitions/interfaces-ethernet.xml.in +++ b/interface-definitions/interfaces-ethernet.xml.in @@ -22,7 +22,8 @@ <children> #include <include/address-ipv4-ipv6-dhcp.xml.i> #include <include/interface-description.xml.i> - #include <include/dhcp-dhcpv6-options.xml.i> + #include <include/dhcp-options.xml.i> + #include <include/dhcpv6-options.xml.i> <leafNode name="disable-flow-control"> <properties> <help>Disable Ethernet flow control (pause frames)</help> diff --git a/interface-definitions/interfaces-pseudo-ethernet.xml.in b/interface-definitions/interfaces-pseudo-ethernet.xml.in index ea267cf81..61fd6c9fd 100644 --- a/interface-definitions/interfaces-pseudo-ethernet.xml.in +++ b/interface-definitions/interfaces-pseudo-ethernet.xml.in @@ -18,7 +18,8 @@ <children> #include <include/address-ipv4-ipv6-dhcp.xml.i> #include <include/interface-description.xml.i> - #include <include/dhcp-dhcpv6-options.xml.i> + #include <include/dhcp-options.xml.i> + #include <include/dhcpv6-options.xml.i> #include <include/interface-disable-link-detect.xml.i> #include <include/interface-disable.xml.i> #include <include/interface-vrf.xml.i> diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in index 7cf4da70f..d21074b6a 100644 --- a/interface-definitions/interfaces-wireless.xml.in +++ b/interface-definitions/interfaces-wireless.xml.in @@ -446,7 +446,8 @@ </properties> </leafNode> #include <include/interface-description.xml.i> - #include <include/dhcp-dhcpv6-options.xml.i> + #include <include/dhcp-options.xml.i> + #include <include/dhcpv6-options.xml.i> <leafNode name="disable-broadcast-ssid"> <properties> <help>Disable broadcast of SSID from access-point</help> |