From d869559037802dcef6e2cd8551ab3ac0ececf690 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 24 Dec 2010 15:31:54 +0000
Subject: init: support lvm ontop of raid devices

---
 initramfs-init.in | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/initramfs-init.in b/initramfs-init.in
index 81b7150..d140d75 100755
--- a/initramfs-init.in
+++ b/initramfs-init.in
@@ -173,6 +173,14 @@ setup_inittab_console(){
 	done
 }
 
+# start lvm if exists
+start_lvm() {
+	[ -x /sbin/lvm ] || return
+	modprobe dm-mod
+	lvm vgscan --mknodes --ignorelockingfailure >/dev/null 2>&1 &&\
+		lvm vgchange --ignorelockingfailure -a y >/dev/null 2>&1
+}
+
 # gotta start from somewhere :)
 echo "Alpine Init $VERSION"
 
@@ -260,13 +268,6 @@ scan_drivers
 scan_drivers
 eend 0
 
-# start lvm if exists
-if [ -x /sbin/lvm ]; then
-	modprobe dm-mod
-	lvm vgscan --mknodes --ignorelockingfailure >/dev/null 2>&1 &&\
-		lvm vgchange --ignorelockingfailure -a y >/dev/null 2>&1
-fi
-
 # check if root=... was set
 if [ -n "$KOPT_root" ]; then
 	if [ "$SINGLEMODE" = "yes" ]; then
@@ -282,6 +283,7 @@ if [ -n "$KOPT_root" ]; then
 			raidautorun "$KOPT_root"
 			;;
 	esac
+	start_lvm
 	ebegin "Mounting root"
 	retry_mount -o ro $KOPT_root $sysroot 2>/dev/null
 	eend $?
@@ -297,6 +299,9 @@ 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
-- 
cgit v1.2.3