From 5ffd9b46d64ad0c31abf77cba2e9a4e1dcd76067 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Sat, 13 Feb 2010 17:01:23 +0000
Subject: main/mdadm: fix init.d script

fixes #275
fixes #276
---
 main/mdadm/mdadm-raid.initd | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

(limited to 'main/mdadm/mdadm-raid.initd')

diff --git a/main/mdadm/mdadm-raid.initd b/main/mdadm/mdadm-raid.initd
index ea84088886..d2479737cd 100644
--- a/main/mdadm/mdadm-raid.initd
+++ b/main/mdadm/mdadm-raid.initd
@@ -1,19 +1,42 @@
 #!/sbin/runscript
 
 # script to start raid devices described in /etc/mdadm.conf.
+depend() {
+	before checkfs fsck
+	after modules
+}
 
 start() {
+	[ -f /etc/mdadm.conf ] || return 0
+	# start all devices that are not already started
 	[ -f /proc/mdstat ] || modprobe -k md > /dev/null 2>&1
+	local tostart=
 	ebegin "Starting RAID devices"
-	mdadm -A -s -q
+	for i in $(awk '{print $2}' /etc/mdadm.conf); do
+		[ -b "$i" ] && continue
+		tostart="$tostart $i"
+	done		
+	mdadm --assemble --scan --quiet $tostart
 	eend $?						
 }
 
+is_mounted_as() {
+	local mnt
+	for mnt in $(awk "\$1 == \"$1\" {print \$2}" /proc/mounts); do
+		[ "$mnt" = "$2" ] && return 0
+	done
+	return 1
+}
+
 stop() {
-	# you need to make sure no device is mounted.
-	if [ -f /etc/mdadm.conf ] ; then
-		ebegin "Stopping RAID devices"
-		mdadm --stop -q `awk '/^ARRAY/ { print $2 }' /etc/mdadm.conf`
-		eend $?
-	fi
+	# stop all raid devices except anything mounted as /
+	[ -f /etc/mdadm.conf ] || return 0
+	ebegin "Stopping RAID devices"
+	local tostop=
+	for i in $(awk '{print $2}' /etc/mdadm.conf); do
+		is_mounted_as $i / && continue
+		tostop="$tostop $i"
+	done
+	mdadm --stop --quiet $tostop
+	eend $?
 }
-- 
cgit v1.2.3