no need to mess with magic values, let the "magic" be value

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

diff --git a/mod-md.sh b/mod-md.sh
index 457b0d563e0e178d8e507d2aefd3dbc91654cd4c..0c06e7285377bc7a32357122c1ad89ad59f778c5 100644 (file)
--- a/mod-md.sh
+++ b/mod-md.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
-#
+MD_RCSID='$Revision$ $Date::                            $'
+
 # geninitrd mod: mdadm
 USE_MD=${USE_MD:-yes}
 
@@ -51,14 +52,15 @@ find_modules_md() {
                        found = "no";
                        dev_list = "";
                        raidlevel = ""
-                       rootdev_alternate = rootdev;
-                       # alternate name: normalize from /dev/md/X to /dev/mdX
-                       if (rootdev_alternate ~ /\/dev\/md\/[0-9]+/) {
-                               gsub(/\/dev\/md\//,"/dev/md",rootdev_alternate);
+                       rootdev_new = rootdev
+                       rootdev_alias = rootdev;
+                       # alternative name: normalize from /dev/md/X to /dev/mdX
+                       if (rootdev_alias ~ /\/dev\/md\/[0-9]+/) {
+                               gsub(/\/dev\/md\//,"/dev/md",rootdev_alias);
                        }
-                       # altername name: normalize from /dev/mdXpY to /dev/mdX
-                       if (rootdev_alternate ~/\/dev\/md[0-9]+p[0-9]+/) {
-                               gsub((/p[0-9]+/,"",rootdev_alternative);
+                       # alternative name: normalize from /dev/mdXpY to /dev/mdX
+                       if (rootdev_alias ~/\/dev\/md[0-9]+p[0-9]+/) {
+                               gsub(/p[0-9]+/,"",rootdev_alias);
                        }
                }
 
@@ -68,8 +70,9 @@ find_modules_md() {
                        if (arr_device ~ /\/dev\/md\/[0-9]+/) {
                                gsub(/\/dev\/md\//,"/dev/md",arr_device);
                        }
-                       if ((arr_device == rootdev) || (arr_device == rootdev_alternate)) {
+                       if ((arr_device == rootdev) || (arr_device == rootdev_alias)) {
                                raidlevel=$3;
+                               rootdev_new=arr_device
                                gsub(/level=/,NUL,raidlevel);
                                if (raidlevel ~ /^raid([0-6]|10)/) {
                                        gsub(/raid/,NUL,raidlevel);
@@ -85,6 +88,7 @@ find_modules_md() {
                }
 
                END {
+                       print "rootdev_new=" rootdev_new;
                        print "have_md=" found;
                        print "raidlevel=" raidlevel;
                        print "dev_list=\"" dev_list "\"";
@@ -115,10 +119,10 @@ find_modules_md() {
                die "RAID devices not found for \"$1\", check your configuration!"
        fi
 
-       debug "md: found rootdev=$1 with devices list ${dev_list}"
+       debug "md: found rootdev=$1 on device $rootdev_new with devices list ${dev_list}"
 
        rootdev_nr=$(( $rootdev_nr + 1 ))
-       eval "rootdev${rootdev_nr}=\"$1\""
+       eval "rootdev${rootdev_nr}=\"$rootdev_new\""
        eval "dev_list${rootdev_nr}=\"${dev_list}\""
 
        for device in $dev_list; do
@@ -130,6 +134,9 @@ find_modules_md() {
 # generate initrd fragment for md
 # @access      public
 initrd_gen_md() {
+       if ! is_yes "$have_md"; then
+               return
+       fi
        debug "Setting up mdadm..."
 
        inst_exec $mdassemble /bin/mdassemble
@@ -137,15 +144,18 @@ initrd_gen_md() {
        # LVM on RAID case
        local dev_list_extra ex_dev
        dev_list_extra=$(awk '/^DEVICE / { for (i=2; i<=NF; i++) { printf "%s ", $i; }; } ' /etc/mdadm.conf | xargs)
-       if [ "$dev_list_extra" = "partitions" ]; then
-               # FIXME: handle this case (see man mdadm.conf)
-               echo "DEVICE partitions" >> "$DESTDIR/etc/mdadm.conf"
-               dev_list_extra=""
-       else
-               for ex_dev in $dev_list_extra; do
-                       echo "DEVICE $ex_dev" >> "$DESTDIR/etc/mdadm.conf"
-               done
-       fi
+       new_dev_list_extra=""
+       for ex_dev in $dev_list_extra; do
+               if [ "$ex_dev" = "partitions" ]; then
+                       echo "DEVICE partitions" >> "$DESTDIR/etc/mdadm.conf"
+                       # FIXME: find and copy partition devices from /proc/partitions
+                       #        - best if done at runtime, now initrd gen time
+                       continue
+               fi
+               echo "DEVICE $ex_dev" >> "$DESTDIR/etc/mdadm.conf"
+               new_dev_list_extra="$new_dev_list_extra $ex_dev"
+       done
+       dev_list_extra=$new_dev_list_extra
 
        local cr_rootdev cr_dev_list do_md0=1 nr cr_dev_list_md f cr_md_conf
        for nr in `seq 1 $rootdev_nr`; do
@@ -173,7 +183,13 @@ initrd_gen_md() {
                done
        done
 
-       echo "mdassemble" | add_linuxrc
+       add_linuxrc <<-EOF
+       mdassemble
+
+       if [ "$DEBUGINITRD" ]; then
+               [ -e /proc/mdstat ] && echo "/proc/mdstat contents:" && cat /proc/mdstat
+       fi
+       EOF
 
        # needed to determine md-version
        if [ "$do_md0" -eq 1 ]; then