diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-05-05 17:12:55 +0200 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-05-05 17:12:55 +0200 |
| commit | 079a37dfaa422323a5bb589fb036e23f83e2ac72 (patch) | |
| tree | f79c8acb402988a1c9ec560790c2e88f3a1f58ac | |
| parent | 30d61eedc925c91d12055b01d4b1ff4559c876b9 (diff) | |
| download | mkinitcpio-079a37dfaa422323a5bb589fb036e23f83e2ac72.tar.gz mkinitcpio-079a37dfaa422323a5bb589fb036e23f83e2ac72.tar.xz | |
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
| -rw-r--r-- | hooks/encrypt | 3 | ||||
| -rw-r--r-- | hooks/lvm2 | 2 | ||||
| -rw-r--r-- | hooks/raid | 4 |
3 files changed, 6 insertions, 3 deletions
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 @@ -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 @@ -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} } |