From b76931e6d3a4bd0cdb74ca447a746ab6855fcf55 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 18 May 2021 19:13:34 +0200
Subject: revert: "util: T2467: add autosudo as an option to command"

Implementing a wrapper which will - based on the command - add a sudo prefix
to the execution string seemed to be a nice idea but unfortunately it did not
only not get momentum but also the codebase somethis added an implicit "sudo"
call a second time.

This resulted in a call: "sudo sudo systemctl"

The entire functionality was removed again and if an op-mode script requires
root priviledges it must be explicitly called with them - no black magic.
---
 op-mode-definitions/conntrack-sync.xml.in          | 18 +++++++++---------
 op-mode-definitions/flow-accounting-op.xml.in      |  2 +-
 op-mode-definitions/generate-ssh-server-key.xml.in |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/conntrack-sync.xml.in b/op-mode-definitions/conntrack-sync.xml.in
index d1d3bf744..41a71b04a 100644
--- a/op-mode-definitions/conntrack-sync.xml.in
+++ b/op-mode-definitions/conntrack-sync.xml.in
@@ -11,13 +11,13 @@
             <properties>
               <help>Reset external cache and request resync with other systems</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/conntrack_sync.py --reset-cache-external</command>
+            <command>sudo ${vyos_op_scripts_dir}/conntrack_sync.py --reset-cache-external</command>
           </leafNode>
           <leafNode name="internal-cache">
             <properties>
               <help>Reset internal cache and request resync with other systems</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/conntrack_sync.py --reset-cache-internal</command>
+            <command>sudo ${vyos_op_scripts_dir}/conntrack_sync.py --reset-cache-internal</command>
           </leafNode>
         </children>
       </node>
@@ -29,7 +29,7 @@
         <properties>
           <help>Restart connection tracking synchronization service</help>
         </properties>
-        <command>${vyos_op_scripts_dir}/conntrack_sync.py --restart</command>
+        <command>sudo ${vyos_op_scripts_dir}/conntrack_sync.py --restart</command>
       </leafNode>
     </children>
   </node>
@@ -49,19 +49,19 @@
                 <properties>
                   <help>Show external connection tracking cache entries</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/conntrack_sync.py --show-external; ${vyos_op_scripts_dir}/conntrack_sync.py --show-external-expect</command>
+                <command>sudo ${vyos_op_scripts_dir}/conntrack_sync.py --show-external; ${vyos_op_scripts_dir}/conntrack_sync.py --show-external-expect</command>
                 <children>
                   <leafNode name="main">
                     <properties>
                       <help>Show external main connection tracking cache entries</help>
                     </properties>
-                    <command>${vyos_op_scripts_dir}/conntrack_sync.py --show-external</command>
+                    <command>sudo ${vyos_op_scripts_dir}/conntrack_sync.py --show-external</command>
                   </leafNode>
                   <leafNode name="expect">
                     <properties>
                       <help>Show external expect connection tracking cache entries</help>
                     </properties>
-                    <command>${vyos_op_scripts_dir}/conntrack_sync.py --show-external-expect</command>
+                    <command>sudo ${vyos_op_scripts_dir}/conntrack_sync.py --show-external-expect</command>
                   </leafNode>
                 </children>
               </node>
@@ -69,19 +69,19 @@
                 <properties>
                   <help>Show internal connection tracking cache entries</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/conntrack_sync.py --show-internal; ${vyos_op_scripts_dir}/conntrack_sync.py --show-internal-expect</command>
+                <command>sudo ${vyos_op_scripts_dir}/conntrack_sync.py --show-internal; ${vyos_op_scripts_dir}/conntrack_sync.py --show-internal-expect</command>
                 <children>
                   <leafNode name="main">
                     <properties>
                       <help>Show internal main connection tracking cache entries</help>
                     </properties>
-                    <command>${vyos_op_scripts_dir}/conntrack_sync.py --show-internal</command>
+                    <command>sudo ${vyos_op_scripts_dir}/conntrack_sync.py --show-internal</command>
                   </leafNode>
                   <leafNode name="expect">
                     <properties>
                       <help>Show internal expect connection tracking cache entries</help>
                     </properties>
-                    <command>${vyos_op_scripts_dir}/conntrack_sync.py --show-internal-expect</command>
+                    <command>sudo ${vyos_op_scripts_dir}/conntrack_sync.py --show-internal-expect</command>
                   </leafNode>
                 </children>
               </node>
diff --git a/op-mode-definitions/flow-accounting-op.xml.in b/op-mode-definitions/flow-accounting-op.xml.in
index b847338f9..7aaae5974 100644
--- a/op-mode-definitions/flow-accounting-op.xml.in
+++ b/op-mode-definitions/flow-accounting-op.xml.in
@@ -57,7 +57,7 @@
         <properties>
           <help>Restart (net)flow accounting process</help>
         </properties>
-        <command>${vyos_op_scripts_dir}/flow_accounting_op.py --action restart</command>
+        <command>sudo ${vyos_op_scripts_dir}/flow_accounting_op.py --action restart</command>
       </leafNode>
     </children>
   </node>
diff --git a/op-mode-definitions/generate-ssh-server-key.xml.in b/op-mode-definitions/generate-ssh-server-key.xml.in
index 86bb1b1bd..ecea3e5d1 100644
--- a/op-mode-definitions/generate-ssh-server-key.xml.in
+++ b/op-mode-definitions/generate-ssh-server-key.xml.in
@@ -14,7 +14,7 @@
             <properties>
               <help>Re-generate SSH host keys and restart SSH server</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/generate_ssh_server_key.py</command>
+            <command>sudo ${vyos_op_scripts_dir}/generate_ssh_server_key.py</command>
           </node>
           <tagNode name="client-key">
             <properties>
-- 
cgit v1.2.3