- swsusp support from mis@pld-linux

[projects/geninitrd.git] / mod-md.sh

diff --git a/mod-md.sh b/mod-md.sh
index eed27c71dddea1c5ede109afce9c8a03f100ca76..a3585170fb7bb56e1db25ed4f72f75ffe64d717a 100644 (file)
--- a/mod-md.sh
+++ b/mod-md.sh
@@ -8,10 +8,6 @@ have_md=no
 # setup geninitrd module
 # @access      public
 setup_mod_md() {
-       mdassemble=$(find_tool $initrd_dir/mdassemble /sbin/initrd-mdassemble)
-       if [ ! -x "$mdassemble" ]; then
-               USE_MD=no
-       fi
        mdadm=$(find_tool /sbin/mdadm $initrd_dir/mdadm /sbin/initrd-mdadm)
        if [ ! -x "$mdadm" ]; then
                USE_MD=no
@@ -137,7 +133,7 @@ initrd_gen_md() {
        fi
        verbose "Setting up mdadm..."
 
-       inst_exec $mdassemble /bin/mdassemble
+       inst_exec $mdadm /sbin/mdadm
 
        echo "DEVICE partitions containers" >> "$DESTDIR/etc/mdadm.conf"
 
@@ -185,7 +181,7 @@ initrd_gen_md() {
 
        echo "wait_for_files $cr_dev_list" | add_linuxrc
        add_linuxrc <<-'EOF'
-       mdassemble
+       /sbin/mdadm --assemble --scan
 
        if [ "$DEBUGINITRD" ]; then
                [ -e /proc/mdstat ] && echo "/proc/mdstat contents:" && cat /proc/mdstat