From 28f22431441f37985dfd7ec699bfc61aafd82732 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 22 Aug 2021 20:41:11 +0200
Subject: xml: op-mode: remove multiple "Reset a service" help definitions

That nasty workaround to always specify the same value for the node.def file
as the help text is no longer necessary after commit 17b5ac14 ("T3165: op-mode:
prevent override of populated node.def file with empty content".

The redundant definitions are no longer necessary.

(cherry picked from commit 536991d0c6f305256ce6ab5975d15116f027b7b6)
---
 op-mode-definitions/dns-forwarding.xml.in  | 3 ---
 op-mode-definitions/ipv4-route.xml.in      | 6 ------
 op-mode-definitions/ipv6-route.xml.in      | 6 ------
 op-mode-definitions/openvpn.xml.in         | 3 ---
 op-mode-definitions/pppoe-server.xml.in    | 3 ---
 op-mode-definitions/reset-conntrack.xml.in | 3 ---
 op-mode-definitions/reset-vpn.xml.in       | 3 ---
 op-mode-definitions/terminal.xml.in        | 8 --------
 8 files changed, 35 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/dns-forwarding.xml.in b/op-mode-definitions/dns-forwarding.xml.in
index 36fe6b5ef..6574f2319 100644
--- a/op-mode-definitions/dns-forwarding.xml.in
+++ b/op-mode-definitions/dns-forwarding.xml.in
@@ -59,9 +59,6 @@
     </children>
   </node>
   <node name="reset">
-    <properties>
-      <help>Reset a service</help>
-    </properties>
     <children>
       <node name="dns">
         <properties>
diff --git a/op-mode-definitions/ipv4-route.xml.in b/op-mode-definitions/ipv4-route.xml.in
index aab3df0f1..8f001d5bb 100644
--- a/op-mode-definitions/ipv4-route.xml.in
+++ b/op-mode-definitions/ipv4-route.xml.in
@@ -20,11 +20,7 @@
       </node>
     </children>
   </node>
-
   <node name="reset">
-    <properties>
-      <help>Reset a service</help>
-    </properties>
     <children>
       <node name="ip">
         <properties>
@@ -56,7 +52,6 @@
               </tagNode>
             </children>
           </node>
-
           <node name="route">
             <properties>
               <help>Reset IP route</help>
@@ -68,7 +63,6 @@
                 </properties>
                 <command>sudo ip route flush cache</command>
               </leafNode>
-
               <tagNode name="cache">
                 <properties>
                   <help>Flush the kernel route cache for a given route</help>
diff --git a/op-mode-definitions/ipv6-route.xml.in b/op-mode-definitions/ipv6-route.xml.in
index 28f5b1aad..1c238e1f3 100644
--- a/op-mode-definitions/ipv6-route.xml.in
+++ b/op-mode-definitions/ipv6-route.xml.in
@@ -28,11 +28,7 @@
       </node>
     </children>
   </node>
-
   <node name="reset">
-    <properties>
-      <help>Reset a service</help>
-    </properties>
     <children>
       <node name="ipv6">
         <properties>
@@ -64,7 +60,6 @@
               </tagNode>
             </children>
           </node>
-
           <node name="route">
             <properties>
               <help>Reset IPv6 route</help>
@@ -76,7 +71,6 @@
                 </properties>
                 <command>sudo ip -f inet6 route flush cache</command>
               </leafNode>
-
               <tagNode name="cache">
                 <properties>
                   <help>Flush the kernel IPv6 route cache for a given route</help>
diff --git a/op-mode-definitions/openvpn.xml.in b/op-mode-definitions/openvpn.xml.in
index f8dc0cff0..bc02d05b3 100644
--- a/op-mode-definitions/openvpn.xml.in
+++ b/op-mode-definitions/openvpn.xml.in
@@ -45,9 +45,6 @@
     </children>
   </node>
   <node name="reset">
-    <properties>
-      <help>Reset a service</help>
-    </properties>
     <children>
       <node name="openvpn">
         <children>
diff --git a/op-mode-definitions/pppoe-server.xml.in b/op-mode-definitions/pppoe-server.xml.in
index 6d89b3e77..3d0df44a3 100644
--- a/op-mode-definitions/pppoe-server.xml.in
+++ b/op-mode-definitions/pppoe-server.xml.in
@@ -40,9 +40,6 @@
     </children>
   </node>
   <node name="reset">
-    <properties>
-      <help>Reset a service</help>
-    </properties>
     <children>
       <node name="pppoe-server">
         <properties>
diff --git a/op-mode-definitions/reset-conntrack.xml.in b/op-mode-definitions/reset-conntrack.xml.in
index 827ba4af4..9c8265f77 100644
--- a/op-mode-definitions/reset-conntrack.xml.in
+++ b/op-mode-definitions/reset-conntrack.xml.in
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="reset">
-    <properties>
-      <help>Reset a service</help>
-    </properties>
     <children>
       <node name="conntrack">
         <properties>
diff --git a/op-mode-definitions/reset-vpn.xml.in b/op-mode-definitions/reset-vpn.xml.in
index 71dbb4ed9..94ee1c7df 100644
--- a/op-mode-definitions/reset-vpn.xml.in
+++ b/op-mode-definitions/reset-vpn.xml.in
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="reset">
-    <properties>
-      <help>Reset a service</help>
-    </properties>
     <children>
       <node name="vpn">
         <properties>
diff --git a/op-mode-definitions/terminal.xml.in b/op-mode-definitions/terminal.xml.in
index 9c4e629cb..2a76de146 100644
--- a/op-mode-definitions/terminal.xml.in
+++ b/op-mode-definitions/terminal.xml.in
@@ -40,7 +40,6 @@
         </properties>
         <command>builtin $3</command>
       </tagNode>
-
       <node name="console">
         <properties>
           <help>Control console behaviors</help>
@@ -54,13 +53,11 @@
           </leafNode>
         </children>
       </node>
-
       <node name="terminal">
         <properties>
           <help>Control terminal behaviors</help>
         </properties>
         <children>
-
           <node name="key">
             <properties>
               <help>Set key behaviors</help>
@@ -77,7 +74,6 @@
               </tagNode>
             </children>
           </node>
-
           <node name="pager">
             <properties>
               <help>Set terminal pager to default (less)</help>
@@ -93,7 +89,6 @@
             </properties>
             <command>VYATTA_PAGER=$4</command>
           </tagNode>
-
           <tagNode name="length">
             <properties>
               <help>Set terminal to given number of rows (0 disables paging)</help>
@@ -103,7 +98,6 @@
             </properties>
             <command>if [ "$4" -eq 0 ]; then VYATTA_PAGER=cat; else VYATTA_PAGER=${_vyatta_default_pager}; stty rows $4; fi</command>
           </tagNode>
-
           <tagNode name="width">
             <properties>
               <help>Set terminal to given number of columns</help>
@@ -117,6 +111,4 @@
       </node>
     </children>
   </node>
-
-
 </interfaceDefinition>
-- 
cgit v1.2.3