From 6c51461bfe1e29ecc6ea84288d080330f974111d Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 3 Dec 2019 23:06:48 +0100
Subject: T1843: use include files for DHCP/DHCPv6 options

As 219779b ("T1843: run interface-definitions though GCC preprocessor")
implemented the foundation of using the GCC preprocessor to make our XML
definitions more lightweight this commit transforms the configuration of DHCP/
DHCPv6 configuration options to this new style. It implementes it for the
following interface types:

* bonding
* bridge
* ethernet
* wireless
* vif/vif-s interfaces
---
 interface-definitions/interfaces-bridge.xml.in | 43 +-------------------------
 1 file changed, 1 insertion(+), 42 deletions(-)

(limited to 'interface-definitions/interfaces-bridge.xml.in')

diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index e255e3879..154f47686 100644
--- a/interface-definitions/interfaces-bridge.xml.in
+++ b/interface-definitions/interfaces-bridge.xml.in
@@ -42,48 +42,7 @@
               <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
             </properties>
           </leafNode>
-          <node name="dhcp-options">
-            <properties>
-              <help>DHCP options</help>
-            </properties>
-            <children>
-              <leafNode name="client-id">
-                <properties>
-                  <help>DHCP client identifier</help>
-                </properties>
-              </leafNode>
-              <leafNode name="host-name">
-                <properties>
-                  <help>DHCP client host name (overrides the system host name)</help>
-                </properties>
-              </leafNode>
-              <leafNode name="vendor-class-id">
-                <properties>
-                  <help>DHCP client vendor type</help>
-                </properties>
-              </leafNode>
-            </children>
-          </node>
-          <node name="dhcpv6-options">
-            <properties>
-              <help>DHCPv6 options</help>
-              <priority>319</priority>
-            </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>
+          #include <include/dhcp-dhcpv6-options.xml.i>
           <leafNode name="disable-link-detect">
             <properties>
               <help>Ignore link state changes</help>
-- 
cgit v1.2.3