diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-03-05 20:34:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-05 20:34:37 +0100 |
| commit | 53eca9a3f9eae4947bb0df8bf8a28301cd2aa5c0 (patch) | |
| tree | 919d98f2d08be6a81cfa7193a3586ace6210cd8b | |
| parent | 999cbce33bf40cc37232d2a54a47185d1292f5d0 (diff) | |
| parent | 390e543780b56f98dca3172345ce783819222da8 (diff) | |
| download | vyos-1x-53eca9a3f9eae4947bb0df8bf8a28301cd2aa5c0.tar.gz vyos-1x-53eca9a3f9eae4947bb0df8bf8a28301cd2aa5c0.zip | |
Merge pull request #3092 from vyos/mergify/bp/sagitta/pr-3091
xml: T5738: use generic-disable-node building block for "disable" CLI nodes (backport #3091)
3 files changed, 3 insertions, 18 deletions
diff --git a/interface-definitions/include/firewall/common-rule-bridge.xml.i b/interface-definitions/include/firewall/common-rule-bridge.xml.i index 6de770c79..dcdd970ac 100644 --- a/interface-definitions/include/firewall/common-rule-bridge.xml.i +++ b/interface-definitions/include/firewall/common-rule-bridge.xml.i @@ -9,12 +9,7 @@ #include <include/firewall/mac-address.xml.i> </children> </node> -<leafNode name="disable"> - <properties> - <help>Option to disable firewall rule</help> - <valueless/> - </properties> -</leafNode> +#include <include/generic-disable-node.xml.i> <leafNode name="jump-target"> <properties> <help>Set jump target. Action jump must be defined to use this setting</help> diff --git a/interface-definitions/include/firewall/common-rule-inet.xml.i b/interface-definitions/include/firewall/common-rule-inet.xml.i index 85189d975..bef1c3da5 100644 --- a/interface-definitions/include/firewall/common-rule-inet.xml.i +++ b/interface-definitions/include/firewall/common-rule-inet.xml.i @@ -7,12 +7,7 @@ #include <include/firewall/connection-mark.xml.i> #include <include/firewall/conntrack-helper.xml.i> #include <include/firewall/nft-queue.xml.i> -<leafNode name="disable"> - <properties> - <help>Option to disable firewall rule</help> - <valueless/> - </properties> -</leafNode> +#include <include/generic-disable-node.xml.i> <node name="fragment"> <properties> <help>IP fragment match</help> diff --git a/interface-definitions/include/firewall/common-rule-ipv4-raw.xml.i b/interface-definitions/include/firewall/common-rule-ipv4-raw.xml.i index 0d749aa27..e7468bfba 100644 --- a/interface-definitions/include/firewall/common-rule-ipv4-raw.xml.i +++ b/interface-definitions/include/firewall/common-rule-ipv4-raw.xml.i @@ -18,12 +18,7 @@ #include <include/firewall/source-destination-group.xml.i> </children> </node> -<leafNode name="disable"> - <properties> - <help>Option to disable firewall rule</help> - <valueless/> - </properties> -</leafNode> +#include <include/generic-disable-node.xml.i> <node name="fragment"> <properties> <help>IP fragment match</help> |