[projects/geninitrd] Use mdadm instead of mdassemble (since mdadm 4.1 dropped mdassemble).

[arekm]

commit 76c95f3fb8ac2739ac335614c2d303d279d349dd
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date:   Mon Dec 17 15:43:55 2018 +0100

    Use mdadm instead of mdassemble (since mdadm 4.1 dropped mdassemble).

 mod-md.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/mod-md.sh b/mod-md.sh
index eed27c7..2b6f587 100644
--- 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 /bin/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
+       mdadm --assemble --scan
 
        if [ "$DEBUGINITRD" ]; then
                [ -e /proc/mdstat ] && echo "/proc/mdstat contents:" && cat 
/proc/mdstat
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/geninitrd.git/commitdiff/2e48ae25c3ef36969f55494f5477a7ac29c65773

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit