* Initial attempt to get the device-mapper stuff in order

* Moved 'init' to /lib/initcpio/init to be more in-tune
  with the naming scheme


git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@27 880c04e9-e011-0410-abf7-b926e227c9cd

4 files changed, 24 insertions, 20 deletions

diff --git a/install/base b/install/base
index 170df1b..0bb45db 100644
--- a/install/base
+++ b/install/base
@@ -18,7 +18,7 @@ install ()
         add_file $f /bin/$(basename $f)
     done
 
-    add_file "/lib/initramfs/init" "/init"
+    add_file "/lib/initcpio/init" "/init"
     add_file "${CONFIG}" "/config"
     SCRIPT=""
 }
diff --git a/install/dm b/install/dm
deleted file mode 100644
index 7011f5e..0000000
--- a/install/dm
+++ /dev/null
@@ -1,17 +0,0 @@
-# vim: set ft=sh:
-
-install ()
-{
-    MODULES=" $(all_modules "/md/" | grep -v "raid")"
-    BINARIES=""
-    FILES=""
-    SCRIPT="UNKNOWN"
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook loads the necessary modules for an device mapper device.
-  Detection will take place at runtime.
-HELPEOF
-}
diff --git a/install/encrypt b/install/encrypt
index e2087e4..d81966b 100644
--- a/install/encrypt
+++ b/install/encrypt
@@ -2,9 +2,11 @@
 
 install ()
 {
-    MODULES=" aes-i586 $(find "${MODULEDIR}/kernel/drivers/md" -name dm*.ko) "
-    BINARIES="cryptsetup.static"
+    MODULES=" dm-crypt $(all_modules "/crypto/") "
+    BINARIES=""
+    add_file "/sbin/cryptsetup.static" "/bin/cryptsetup"
     FILES=""
+    SCRIPT="encrypt"
 }
 
 help ()
diff --git a/install/lvm2 b/install/lvm2
new file mode 100644
index 0000000..c6cacc3
--- /dev/null
+++ b/install/lvm2
@@ -0,0 +1,19 @@
+# vim: set ft=sh:
+
+install ()
+{
+    MODULES=" dm-mod "
+    BINARIES=""
+    FILES=""
+    SCRIPT="lvm2"
+
+    add_dir "/dev/mapper"
+    add_file "/sbin/lvm.static" "/bin/lvm"
+}
+
+help ()
+{
+cat<<HELPEOF
+  This hook loads the necessary modules for an LVM2 root device.
+HELPEOF
+}