Changeset 2354 in MondoRescue

Timestamp:

Aug 28, 2009, 7:10:22 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Addition of a nomd option to avoid starting mdadm
• mpath is now already started if there was a mpath entry in mountlist

(Backport from 2.2.9)

Location:

branches/2.2.10/mindi

Files:

• README.bootparam (modified) (1 diff)
• rootfs/sbin/init (modified) (3 diffs)

branches/2.2.10/mindi/README.bootparam

@@ -39 +39 @@
     Do not call the mindi-rsthw script which try to restore also your BIOSes configuration (Proliant only)
 
+nomd
+    Do not try to start mdadm support
+
 nompath
     Do not try to start multipath support

branches/2.2.10/mindi/rootfs/sbin/init

@@ -455 +455 @@
         return;
     fi
-    echo "Starting Mpath..."
-    if [ -x /sbin/multipath ]; then
-        mkdir -p /var/lib/multipath
-        cat > /etc/multipath.conf << EOF
+    if [ "`grep mpath /tmp/mountlist.txt`" ]; then
+        if [ -x /sbin/multipath ]; then
+            echo "Starting Mpath..."
+            mkdir -p /var/lib/multipath
+            cat > /etc/multipath.conf << EOF
 defaults {
         user_friendly_names yes
 }
 EOF
-        /sbin/multipath -v 0
-        if [ -x /sbin/kpartx ]; then
-            /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p p"
+            /sbin/multipath -v 0
+            if [ -x /sbin/kpartx ]; then
+                /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p p"
+            fi
         fi
     fi
@@ -472 +474 @@
 StartRaids() {
     local raid_devices i
+
+    if [ "`grep -i noraid /proc/cmdline`" ]; then
+        return;
+    fi
 
     raid_devices=`grep /dev/md /tmp/mountlist.txt | cut -d' ' -f1`
@@ -484 +490 @@
         done
     elif which mdrun > /dev/null 2> /dev/null ; then
+        if [ "`grep -i nomd /proc/cmdline`" ]; then
+            return;
+        fi
         LogIt "Running 'mdrun'" 1
         mdrun
     elif which mdadm > /dev/null 2> /dev/null ; then
+        if [ "`grep -i nomd /proc/cmdline`" ]; then
+            return;
+        fi
         LogIt "Running 'mdadm'" 1
         for i in $raid_devices ; do