mdadm & runit-scripts: remove run from mdadm / update run in runit-scripts and rm finish

2 files changed, 10 insertions, 36 deletions

diff --git a/abs/core-testing/runit-scripts/runitscripts/services/mdadm/finish b/abs/core-testing/runit-scripts/runitscripts/services/mdadm/finish
deleted file mode 100755
index 92782ba..0000000
--- a/abs/core-testing/runit-scripts/runitscripts/services/mdadm/finish
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash

-#

-# Stop Monitoring software raid arrays

-exec 2>&1

-export TERM=linux

-. /etc/rc.conf

-. /etc/rc.d/functions

-

-PID=`pidof -o %PPID /sbin/mdadm`

-    stat_runit "Stopping mdadm RAID Monitor"

-    [ ! -z "$PID" ] && kill $PID &>/dev/null

-    if [ $? -gt 0 ]; then

-      stat_fail

-    else

-      rm_daemon mdadm

-      stat_done

-    fi

diff --git a/abs/core-testing/runit-scripts/runitscripts/services/mdadm/run b/abs/core-testing/runit-scripts/runitscripts/services/mdadm/run
index 0ab432e..567332e 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/mdadm/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/mdadm/run
@@ -1,19 +1,10 @@
-#!/bin/bash

-#

-# Start Monitoring software raid arrays

-exec 2>&1

-export TERM=linux

-. /etc/rc.conf

-. /etc/rc.d/functions

-

-PID=`pidof -o %PPID /sbin/mdadm`

-    stat_runit "Starting mdadm RAID Monitor"

-    if [ -z "$PID" ]; then

-       /sbin/mdadm -F -s

-    fi

-    if [ ! -z "$PID" -o $? -gt 0 ]; then

-      stat_fail

-    else

-      add_daemon mdadm

-      stat_done

-    fi

+#!/bin/bash
+#
+# Start Monitoring software raid arrays
+exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+    stat_runit "Starting mdadm RAID Monitor"
+       exec /sbin/mdadm -F -s