Changeset 2533 in MondoRescue

Timestamp:

Jan 8, 2010, 3:55:41 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3753@localhost: bruno | 2010-01-08 14:25:33 +0100

• First attempt to support device exclusion at restore time through a new boot param excludedevs
• Fix a bug preventing execution of the pre script in init

Location:

branches/2.2.9/mindi

Files:

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

branches/2.2.9/mindi/README.bootparam

@@ -26 +26 @@
 donteject
     mondorestore will not eject the CD; this is useful if, for instance, your PC's case has a concealed CD-ROM drive
+
+excludedevs="dev1 dev2"
+    Exclude those evices from retoration process (no LVM action done suc has pvcreate, and no partitioning. Those devices are removed from /tmp/mountlist.txt and /tmp/i-want-my-lvm)
 
 forcemods="mod1 mod2"

branches/2.2.9/mindi/rootfs/sbin/init

@@ -400 +400 @@
             vgscan
         fi
+
+        # Exclude devices we may not want
+        rm -f /tmp/restorevgs
+        for d in $EXCLUDE_DEVS ; do
+            echo " == $d"
+            EXCLUDE_VGS=`grep " $d" /tmp/i-want-my-lvm | grep vgcreate | awk '{print $4}'`
+            vg=`echo $EXCLUDE_VGS | sed "s/ /|/g"`
+            if [ "$vg" != "" ]; then
+                re=" $d|$vg"
+            else 
+                re=" $d"
+            fi
+            # Remove VGs from i-want-my-lvm
+            grep -Ev "$re" /tmp/i-want-my-lvm > /tmp/i-want-my-lvm.new
+            mv /tmp/i-want-my-lvm.new /tmp/i-want-my-lvm
+            # Prepare  script to restore the VG exluded here if needed
+            for v in $EXCLUDE_VGS; do
+                echo "vgcfgrestore $v" >> /tmp/restorevgs
+                # Remove LVs from mountlist
+                EXCLUDE_LVS=`grep " $v" /tmp/i-want-my-lvm | grep lvcreate | sed "s/^.*-n \([^ ][^ ]*\) .*$/$1/"`
+                for l in $EXCLUDE_LVS; do
+                    grep -Ev "/dev/$v/$l" /tmp/mountlist.txt > /tmp/mountlist.txt.new
+                    mv /tmp/mountlist.txt.new /tmp/mountlist.txt
+                done
+            done
+        done
+
         grep -E "^#.*vgchange" /tmp/i-want-my-lvm | sed "s/^#[ ]*//" > /tmp/start-lvm
         chmod +x /tmp/start-lvm
@@ -701 +728 @@
     export FORCE_MODS=" "
 fi
+if [ "`grep -i excludedevs /proc/cmdline`" ]; then
+    export EXCLUDE_DEVS="`cat /proc/cmdline | sed 's~.*excludedevs=\"\(.*\)\".*~\1~'` mondonone"
+else
+    export EXCLUDE_DEVS=" "
+fi
 
 echo "Activating a potential USB keyboard/mouse"
@@ -860 +892 @@
     # start-netfs moved it under /tmp as the NFS share is already unmounted 
     if [ "`echo $pre | grep -E '^/tmp/isodir'`" ]; then
-        post=`echo $pre | sed 's|^/tmp/isodir|/tmp|'`
+        pre=`echo $pre | sed 's|^/tmp/isodir|/tmp|'`
     fi
     if [ -x $pre ]; then