From 9e14244d84e1525808cecb586e6df93381dd6543 Mon Sep 17 00:00:00 2001
From: Runar Borge <runar@borge.nu>
Date: Thu, 7 Jun 2018 23:31:37 +0200
Subject: T689: convert show disks with completion script to new script

---
 src/completion/list_disks.sh | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100755 src/completion/list_disks.sh

(limited to 'src')

diff --git a/src/completion/list_disks.sh b/src/completion/list_disks.sh
new file mode 100755
index 000000000..f32e558fd
--- /dev/null
+++ b/src/completion/list_disks.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Completion script used by show disks to collect physical disk
+
+awk 'NR > 2 && $4 !~ /[0-9]$/ { print $4 }' </proc/partitions
-- 
cgit v1.2.3


From 327e8d203635d435d75b57f30df6695b56ff63ee Mon Sep 17 00:00:00 2001
From: Runar Borge <runar@borge.nu>
Date: Thu, 7 Jun 2018 23:54:20 +0200
Subject: T689: Convert show raid to new syntax

---
 op-mode-definitions/show-raid.xml | 18 ++++++++++++++++++
 src/completion/list_raidset.sh    |  3 +++
 src/op_mode/show-raid.sh          | 17 +++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 op-mode-definitions/show-raid.xml
 create mode 100755 src/completion/list_raidset.sh
 create mode 100755 src/op_mode/show-raid.sh

(limited to 'src')

diff --git a/op-mode-definitions/show-raid.xml b/op-mode-definitions/show-raid.xml
new file mode 100644
index 000000000..b0930742a
--- /dev/null
+++ b/op-mode-definitions/show-raid.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+    <tagNode name="raid">
+      <properties>
+        <help>Show statis of RAID set</help>
+        <completionHelp>
+          <script>${vyos_completion_dir}/list_raidset.sh</script>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/show_raid.sh $3</command>
+      
+    </tagNode>
+
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/src/completion/list_raidset.sh b/src/completion/list_raidset.sh
new file mode 100755
index 000000000..9ff3523aa
--- /dev/null
+++ b/src/completion/list_raidset.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo -n `cat /proc/partitions | grep md | awk '{ print $4 }'`
diff --git a/src/op_mode/show-raid.sh b/src/op_mode/show-raid.sh
new file mode 100755
index 000000000..ba4174692
--- /dev/null
+++ b/src/op_mode/show-raid.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+raid_set_name=$1
+raid_sets=`cat /proc/partitions | grep md | awk '{ print $4 }'`
+valid_set=`echo $raid_sets | grep $raid_set_name`
+if [ -z $valid_set ]; then
+    echo "$raid_set_name is not a RAID set"
+else
+    if [ -r /dev/${raid_set_name} ]; 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.
+        sudo /sbin/mdadm --detail /dev/${raid_set_name}
+    else
+        echo "Must be administrator or root to display RAID status"
+    fi
+fi
-- 
cgit v1.2.3


From 61dfffa48bac7e5349a04295afb87a08a64f6885 Mon Sep 17 00:00:00 2001
From: Runar Borge <runar@borge.nu>
Date: Thu, 7 Jun 2018 23:58:05 +0200
Subject: T689: op_mode script for 'show disk X format'

---
 src/op_mode/show-disk-format.sh | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100755 src/op_mode/show-disk-format.sh

(limited to 'src')

diff --git a/src/op_mode/show-disk-format.sh b/src/op_mode/show-disk-format.sh
new file mode 100755
index 000000000..61b15a52b
--- /dev/null
+++ b/src/op_mode/show-disk-format.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+disk_dev="/dev/$1"
+if [ ! -b "$disk_dev" ];then 
+  echo "$3 is not a disk device"
+  exit 1
+fi
+sudo /sbin/fdisk -l "$disk_dev"
-- 
cgit v1.2.3


From 3399149b8b07fa74229939bc64a3e573191b237b Mon Sep 17 00:00:00 2001
From: Runar Borge <runar@borge.nu>
Date: Fri, 8 Jun 2018 09:47:59 +0200
Subject: T689: Added missing show-configuration-files.sh wrappwe script

---
 src/op_mode/show-configuration-files.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100755 src/op_mode/show-configuration-files.sh

(limited to 'src')

diff --git a/src/op_mode/show-configuration-files.sh b/src/op_mode/show-configuration-files.sh
new file mode 100755
index 000000000..ad8e0747c
--- /dev/null
+++ b/src/op_mode/show-configuration-files.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Wrapper script for the show configuration files command
+find ${vyatta_sysconfdir}/config/ \
+    -type f \
+    -not -name ".*" \
+    -not -name "config.boot.*" \
+    -printf "%f\t(%Tc)\t%T@\n" \
+        | sort -r -k3 \
+        | awk -F"\t" '{printf ("%-20s\t%s\n", $1,$2) ;}'
-- 
cgit v1.2.3