summaryrefslogtreecommitdiff
path: root/interface-definitions/include
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-08-19 20:24:39 +0200
committerChristian Poessinger <christian@poessinger.com>2021-08-21 15:26:35 +0200
commit0e751221d0832acac807e7f0bc97d7bb31230c3a (patch)
tree6af4ea65452731c07170f66654302dbbe7904bed /interface-definitions/include
parent9d5b9dc4d6907a83204f1815fbf875989bf8fcfc (diff)
downloadvyos-1x-0e751221d0832acac807e7f0bc97d7bb31230c3a.tar.gz
vyos-1x-0e751221d0832acac807e7f0bc97d7bb31230c3a.zip
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.
Diffstat (limited to 'interface-definitions/include')
-rw-r--r--interface-definitions/include/interface/disable-forwarding.xml.i2
-rw-r--r--interface-definitions/include/interface/ipv6-disable-forwarding.xml.i8
-rw-r--r--interface-definitions/include/interface/ipv6-options.xml.i2
3 files changed, 2 insertions, 10 deletions
diff --git a/interface-definitions/include/interface/disable-forwarding.xml.i b/interface-definitions/include/interface/disable-forwarding.xml.i
index a32e5376f..45382ec95 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/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 2d2d1d3b2..f740ce0c2 100644
--- a/interface-definitions/include/interface/ipv6-options.xml.i
+++ b/interface-definitions/include/interface/ipv6-options.xml.i
@@ -5,8 +5,8 @@
</properties>
<children>
#include <include/interface/adjust-mss.xml.i>
+ #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>