From c781f24f593b3b247c8872722b5b44a972443715 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 7 Jan 2011 13:04:59 +0000
Subject: init: allow raid use mdadm if needed

---
 initramfs-init.in | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/initramfs-init.in b/initramfs-init.in
index 8604c12..dca8087 100755
--- a/initramfs-init.in
+++ b/initramfs-init.in
@@ -173,6 +173,26 @@ setup_inittab_console(){
 	done
 }
 
+start_raid() {
+	local n= i=
+	case "$KOPT_root" in
+		/dev/md*) n=${KOPT_root#/dev/md} ;;
+	esac
+	case "$KOPT_autoraid" in
+		[0-9]*) n="$n $(echo $KOPT_autoraid | tr ',' ' ')" ;;
+	esac
+	# if kernel can autostart the raid he will
+	for i in $n; do
+		mknod /dev/md$i b 9 $i
+		raidautorun /dev/md$i
+	done
+	# kernel cannot autostart newer versions of mdadm metadata
+	# so we also check if mdadm binary is there
+	if [ -x /sbin/mdadm ]; then
+		mdadm --assemble --scan
+	fi
+}
+
 # start lvm if exists
 start_lvm() {
 	[ -x /sbin/lvm ] || return
@@ -277,12 +297,7 @@ if [ -n "$KOPT_root" ]; then
 	# let usb settle in case we boot from usb disks
 	[ -n "$KOPT_usbdelay" ] && sleep "$KOPT_usbdelay"
 	wait_usb
-	case "$KOPT_root" in
-		/dev/md*) 
-			mknod $KOPT_root b 9 ${KOPT_root#/dev/md}
-			raidautorun "$KOPT_root"
-			;;
-	esac
+	start_raid
 	start_lvm
 	ebegin "Mounting root"
 	retry_mount -o ro $KOPT_root $sysroot 2>/dev/null
@@ -299,14 +314,15 @@ if [ -n "$KOPT_root" ]; then
 	exec /bin/busybox sh
 fi
 
-# incase we have alpine_dev on raid device...
-start_lvm
-
 # we only want to wait for usb if really needed at this point
 if [ -z "${ALPINE_DEV##*usb*}" ]; then
 	wait_usb
 fi
 
+# incase we have alpine_dev on raid device...
+start_raid
+start_lvm
+
 # locate boot media and mount it
 ebegin "Mounting boot media"
 mkdir -p $ALPINE_MNT
-- 
cgit v1.2.3