From 42d4a9731baa95064d2de299233e98d841f4976e Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 19 Aug 2021 20:24:39 +0200
Subject: xml: interfaces: use one common building block for
 "disable-forwarding"

Both building blocks only differed in the help text, so use IP for both
IPv4 and IPv6.

(cherry picked from commit 0e751221d0832acac807e7f0bc97d7bb31230c3a)
---
 interface-definitions/include/interface/disable-forwarding.xml.i  | 2 +-
 .../include/interface/ipv6-disable-forwarding.xml.i               | 8 --------
 interface-definitions/include/interface/ipv6-options.xml.i        | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 interface-definitions/include/interface/ipv6-disable-forwarding.xml.i

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/interface/disable-forwarding.xml.i b/interface-definitions/include/interface/disable-forwarding.xml.i
index cb6ef0475..cee9d2a8d 100644
--- a/interface-definitions/include/interface/disable-forwarding.xml.i
+++ b/interface-definitions/include/interface/disable-forwarding.xml.i
@@ -1,7 +1,7 @@
 <!-- include start from interface/interface-disable-forwarding.xml.i -->
 <leafNode name="disable-forwarding">
   <properties>
-    <help>Disable IPv4 forwarding on this interface</help>
+    <help>Disable IP forwarding on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/interface/ipv6-disable-forwarding.xml.i b/interface-definitions/include/interface/ipv6-disable-forwarding.xml.i
deleted file mode 100644
index 4adb77d1b..000000000
--- a/interface-definitions/include/interface/ipv6-disable-forwarding.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/ipv6-disable-forwarding.xml.i -->
-<leafNode name="disable-forwarding">
-  <properties>
-    <help>Disable IPv6 forwarding on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/ipv6-options.xml.i b/interface-definitions/include/interface/ipv6-options.xml.i
index dcd5a8710..a5b40c789 100644
--- a/interface-definitions/include/interface/ipv6-options.xml.i
+++ b/interface-definitions/include/interface/ipv6-options.xml.i
@@ -4,8 +4,8 @@
     <help>IPv6 routing parameters</help>
   </properties>
   <children>
+    #include <include/interface/disable-forwarding.xml.i>
     #include <include/interface/ipv6-address.xml.i>
-    #include <include/interface/ipv6-disable-forwarding.xml.i>
     #include <include/interface/ipv6-dup-addr-detect-transmits.xml.i>
   </children>
 </node>
-- 
cgit v1.2.3