From 672b6cc486f140e5598abd41be9d5daebc422b40 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 17 Dec 2022 10:55:26 +0100
Subject: op-mode: T707: explicitly use sudo when working with RAID devices

---
 op-mode-definitions/show-raid.xml.in |  2 +-
 src/op_mode/show_raid.sh             | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/op-mode-definitions/show-raid.xml.in b/op-mode-definitions/show-raid.xml.in
index 8bf394552..2ae3fad6a 100644
--- a/op-mode-definitions/show-raid.xml.in
+++ b/op-mode-definitions/show-raid.xml.in
@@ -9,7 +9,7 @@
             <script>${vyos_completion_dir}/list_raidset.sh</script>
           </completionHelp>
         </properties>
-        <command>${vyos_op_scripts_dir}/show_raid.sh $3</command>
+        <command>sudo ${vyos_op_scripts_dir}/show_raid.sh $3</command>
       </tagNode>
     </children>
   </node>
diff --git a/src/op_mode/show_raid.sh b/src/op_mode/show_raid.sh
index ba4174692..ab5d4d50f 100755
--- a/src/op_mode/show_raid.sh
+++ b/src/op_mode/show_raid.sh
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+if [ "$EUID" -ne 0 ]; then
+    # This should work without sudo because we have read
+    # access to the dev, but for some reason mdadm must be
+    # run as root in order to succeed.
+    echo "Please run as root"
+    exit 1
+fi
+
 raid_set_name=$1
 raid_sets=`cat /proc/partitions | grep md | awk '{ print $4 }'`
 valid_set=`echo $raid_sets | grep $raid_set_name`
@@ -10,7 +18,7 @@ else
         # This should work without sudo because we have read
         # access to the dev, but for some reason mdadm must be
         # run as root in order to succeed.
-        sudo /sbin/mdadm --detail /dev/${raid_set_name}
+        mdadm --detail /dev/${raid_set_name}
     else
         echo "Must be administrator or root to display RAID status"
     fi
-- 
cgit v1.2.3