From 079a37dfaa422323a5bb589fb036e23f83e2ac72 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaron@archlinux.org>
Date: Fri, 5 May 2006 15:12:55 +0000
Subject: Fixes: lvm2+encrypt: modprobe dm-mode before the check for
 device-mapper raid: Pass full CMDLINE to mdassemble

git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@65 880c04e9-e011-0410-abf7-b926e227c9cd
---
 hooks/encrypt | 3 ++-
 hooks/lvm2    | 2 +-
 hooks/raid    | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'hooks')

diff --git a/hooks/encrypt b/hooks/encrypt
index 4992270..30dfc12 100644
--- a/hooks/encrypt
+++ b/hooks/encrypt
@@ -4,8 +4,9 @@
 run_hook ()
 {
     mkdevice () { /bin/mknod "/dev/mapper/control" c ${1} ${2}; }
+
+    /bin/modprobe -a -q dm-crypt >/dev/null 2>&1
     if [ -e "/sys/class/misc/device-mapper" ]; then
-        /bin/modprobe -a -q dm-crypt >/dev/null 2>&1
         read dev_t < /sys/class/misc/device-mapper/dev
         OLDIFS=$IFS; IFS=:
         mkdevice $dev_t
diff --git a/hooks/lvm2 b/hooks/lvm2
index a1788ce..1eaae9a 100644
--- a/hooks/lvm2
+++ b/hooks/lvm2
@@ -3,8 +3,8 @@ run_hook ()
 {
     mkdevice () { /bin/mknod "/dev/mapper/control" c ${1} ${2}; }
 
+    /bin/modprobe -q dm-mod >/dev/null 2>&1
     if [ -e "/sys/class/misc/device-mapper" ]; then
-        /bin/modprobe -q dm-mod >/dev/null 2>&1
         read dev_t < /sys/class/misc/device-mapper/dev
         OLDIFS=$IFS; IFS=:
         mkdevice $dev_t
diff --git a/hooks/raid b/hooks/raid
index 5cf4b2f..f234734 100644
--- a/hooks/raid
+++ b/hooks/raid
@@ -3,5 +3,7 @@ run_hook ()
 {
     #TODO scan for these somehow...
     /bin/modprobe -aq raid0 raid1 raid2 raid5 raid6 >/dev/null 2>&1
-    /bin/mdassemble ${md} ${raid}
+    # md= can be specified multiple times.  The simplistic commandline
+    #  parsing does not handle this, so we will let mdassemble parse it
+    /bin/mdassemble ${CMDLINE}
 }
-- 
cgit v1.2.3-24-g4f1b