fix evms hook

3 files changed, 11 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index eac527c..8c92cc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,13 @@ initramfs-tools (0.40) unstable; urgency=high
   * High urgency upload as udev changed under our feet. Fix RC bugs.
 
   * Add needed bits under /lib/udev: udevsynthesize, udev_run_devd,
-    udev_run_hotplugd. 
+    udev_run_hotplugd.
 
   * Pump udev dep on 0.074-3.
 
- -- maximilian attems <max@sputnik.stro.at>  Wed, 23 Nov 2005 10:12:40 +0100
+  * Fix evms hooks properly until they get merged into the evms itself.
+
+ -- maximilian attems <max@sternwelten.at>  Wed, 23 Nov 2005 10:31:57 +0100
 
 initramfs-tools (0.39) unstable; urgency=medium
 
diff --git a/hooks/evms b/hooks/evms
index 5affeef..1cbc832 100755
--- a/hooks/evms
+++ b/hooks/evms
@@ -21,15 +21,16 @@ if [ ! -x /sbin/evms_activate ]; then
 fi
 
 copy_exec /sbin/evms_activate /sbin
+cp /etc/evms.conf ${DESTDIR}/etc
 
 EVMS_VERSION=$(/usr/sbin/evms_query info | grep "EVMS Version" | awk '{ print $3; }')
 
 mkdir -p ${DESTDIR}/lib/evms/${EVMS_VERSION}
 
-for x in disk lvm2 dos multipath; do
+for x in bbr bbr_seg bsd disk dos drivelink gpt lvm2 mac md multipath; do
 	copy_exec /lib/evms/${EVMS_VERSION}/${x}* /lib/evms/${EVMS_VERSION}
 done
 
-for x in dm_mod; do
+for x in dm_mod linear raid0 raid1 raid10 raid5 raid6; do
         manual_add_modules ${x}
 done
diff --git a/scripts/local-top/evms b/scripts/local-top/evms
index 2ee7e80..8a99549 100755
--- a/scripts/local-top/evms
+++ b/scripts/local-top/evms
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PREREQ="lvm"
+PREREQ=""
 
 prereqs()
 {
@@ -26,6 +26,8 @@ case ${evms} in
 		;;
 esac
 	
-modprobe -q dm-mod
+for module in dm-mod linear raid0 raid1 raid10 raid5 raid6; do
+	modprobe -q $module
+done
 
 /sbin/evms_activate