Changeset 2580 in MondoRescue

Timestamp:

Feb 12, 2010, 5:12:18 PM (14 years ago)

Author:

Bruno Cornec

Message:

• When using excludevs= also exclude from mountlist the devices mentioned. Fix #393.

File:

• branches/2.2.9/mindi/rootfs/sbin/init (modified) (4 diffs)

branches/2.2.9/mindi/rootfs/sbin/init

@@ -404 +404 @@
         rm -f /tmp/restorevgs
         for d in $MINDI_EXCLUDE_DEVS ; do
-            echo " == $d"
+            echo "LVM exclusion == $d"
             EXCLUDE_VGS=`grep " $d" /tmp/i-want-my-lvm | grep vgcreate | awk '{print $4}'`
             vg=`echo $EXCLUDE_VGS | sed "s/ /|/g"`
@@ -746 +746 @@
 if [ "`grep -i excludedevs /proc/cmdline`" ]; then
     export MINDI_EXCLUDE_DEVS="`cat /proc/cmdline | sed 's~.*excludedevs=\"\(.*\)\".*~\1~'` mondonone"
+    for d in $MINDI_EXCLUDE_DEVS ; do
+        echo "Mountlist exclusion == $d"
+        perl -i -ne 'print $_ unless m~$d~' /tmp/mountlist.txt
+    done
 else
     export MINDI_EXCLUDE_DEVS=" "
@@ -821 +825 @@
 RstHW
 echo "Starting potential Raid/Multipath ..."
+[ -e "/tmp/mountlist.txt" ] && cp -f /tmp/mountlist.txt /tmp/mountlist.original
 PauseForRaids
 StartRaids
@@ -836 +841 @@
     cp -af /dev/md2 /dev/md/2 2> /dev/null
 fi
-[ -e "/tmp/mountlist.txt" ] && cp -f /tmp/mountlist.txt /tmp/mountlist.original
 
 if ! [ "`grep -i "pxe" /proc/cmdline`" ] ; then