From fa2960bb1ed4f3b5bb87a83f06cfae1009f928ad Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verison.net>
Date: Wed, 24 Mar 2010 22:08:56 +0000
Subject: mdadm & runit-scripts: remove run from mdadm / update run in
 runit-scripts and rm finish

---
 abs/core-testing/mdadm/PKGBUILD                    |  6 ++--
 abs/core-testing/mdadm/mdadm                       | 37 ----------------------
 abs/core-testing/mdadm/run                         | 10 ------
 abs/core-testing/runit-scripts/PKGBUILD            |  2 +-
 .../runitscripts/services/mdadm/finish             | 17 ----------
 .../runit-scripts/runitscripts/services/mdadm/run  | 29 ++++++-----------
 6 files changed, 13 insertions(+), 88 deletions(-)
 delete mode 100755 abs/core-testing/mdadm/mdadm
 delete mode 100755 abs/core-testing/mdadm/run
 delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/mdadm/finish

diff --git a/abs/core-testing/mdadm/PKGBUILD b/abs/core-testing/mdadm/PKGBUILD
index 147b18b..22ecc25 100644
--- a/abs/core-testing/mdadm/PKGBUILD
+++ b/abs/core-testing/mdadm/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
 pkgver=3.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -12,7 +12,7 @@ depends=('glibc')
 backup=('etc/mdadm.conf')
 conflicts=('udev<135-4')
 source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/$pkgname-$pkgver.tar.bz2 \
-        run mdadm.conf raid-partitions_install raid-partitions_hook)
+        mdadm.conf raid-partitions_install raid-partitions_hook)
 replaces=('raidtools')
 
 build() {
@@ -20,7 +20,6 @@ build() {
   make || return 1
   make INSTALL=/bin/install DESTDIR=$startdir/pkg install
   install -D -m644 ../mdadm.conf $startdir/pkg/etc/mdadm.conf
-  install -D -m755 ../run $startdir/pkg/etc/sv/mdadm/run
   install -D -m644 ../raid-partitions_install $startdir/pkg/lib/initcpio/install/raid-partitions
   install -D -m644 ../raid-partitions_hook $startdir/pkg/lib/initcpio/hooks/raid-partitions
   # a static binary is required for Arch's initrd
@@ -29,7 +28,6 @@ build() {
   install -D -m755 mdadm $startdir/pkg/sbin/mdadm.static
 }
 md5sums=('c5a39f38c465229767a5af2a4eb81bef'
-         '0b12cc70819ec274f6eec0b8a4238970'
          '0ce4c0f9770bf582a71228053566359d'
          '9de7e423ec9c6766b5f5d39915929003'
          '09d72c714b40b6fa1e8eab04c1dabd42')
diff --git a/abs/core-testing/mdadm/mdadm b/abs/core-testing/mdadm/mdadm
deleted file mode 100755
index e196f36..0000000
--- a/abs/core-testing/mdadm/mdadm
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /sbin/mdadm`
-case "$1" in
-  start)
-    stat_busy "Starting mdadm RAID Monitor"
-    if [ -z "$PID" ]; then 
-       /sbin/mdadm --monitor --scan -i /var/run/mdadm.pid -f
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mdadm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mdadm RAID Monitor"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mdadm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/abs/core-testing/mdadm/run b/abs/core-testing/mdadm/run
deleted file mode 100755
index 567332e..0000000
--- a/abs/core-testing/mdadm/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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
diff --git a/abs/core-testing/runit-scripts/PKGBUILD b/abs/core-testing/runit-scripts/PKGBUILD
index 413c825..2c1300d 100755
--- a/abs/core-testing/runit-scripts/PKGBUILD
+++ b/abs/core-testing/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
 pkgver=1.8.0
-pkgrel=108
+pkgrel=109
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license="BSD"
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
-- 
cgit v0.12

