Changeset 2623 in MondoRescue for branches/2.2.10/mindi

Timestamp:

Apr 12, 2010, 3:23:24 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3783@localhost: bruno | 2010-04-11 11:57:27 +0200

• Use MINDI_CACHE for temp file communication between archive/restore
• Remove some now useless globals in mondo
• Remove function get_cfg_file_from_archive_or_bust and get_cfg_file_from_archive
• Adds function get_cfg_file_from_initrd (Not finished)
• Recovery doesn't work in that version atm (checkpoint version)

Location:

branches/2.2.10/mindi

Files:

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

branches/2.2.10/mindi/README.bootparam

@@ -28 +28 @@
 
 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)
+    Exclude those evices from retoration process (no LVM action done suc has pvcreate, and no partitioning. Those devices are removed from /var/cache/mindi/mountlist.txt and /var/cache/mindi/i-want-my-lvm)
 
 forcemods="mod1 mod2"

branches/2.2.10/mindi/mindi

@@ -1847 +1847 @@
     mkdir -p $bigdir/tmp
     if [ $LVM != "false" ]; then
-        $MINDI_DATA/analyze-my-lvm > $bigdir/tmp/i-want-my-lvm 
+        $MINDI_DATA/analyze-my-lvm > $bigdir$MINDI_CACHE/i-want-my-lvm 
         if [ "$?" -ne "0" ]; then
             LVM="false"
-            rm -f $bigdir/tmp/i-want-my-lvm
+            rm -f $bigdir$MINDI_CACHE/i-want-my-lvm
         else
             LogFile "Your i-want-my-lvm file content is:"
             LogFile "-----------------------------------"
-            cat  $bigdir/tmp/i-want-my-lvm >> $LOGFILE
+            cat  $bigdir$MINDI_CACHE/i-want-my-lvm >> $LOGFILE
             LogFile "-----------------------------------"
         fi
-    fi
-
-    if [ _"$MONDO_SHARE" != _"" ]; then
-        for q in filelist.full.gz biggielist.txt ; do
-            [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q"
-            cp -pRdf $MINDI_TMP/$q $bigdir/tmp 2>> $LOGFILE
-        done
     fi
 

branches/2.2.10/mindi/rootfs/sbin/init

@@ -371 +371 @@
         return;
     fi
-    if [ -e "/tmp/i-want-my-lvm" ] ; then
+    if [ -e "$MINDI_CACHE/i-want-my-lvm" ] ; then
         LogIt "Scanning LVM's..." 1
         if which lvm ; then
@@ -385 +385 @@
         for d in $MINDI_EXCLUDE_DEVS ; do
             echo "LVM exclusion == $d"
-            EXCLUDE_VGS=`grep " $d" /tmp/i-want-my-lvm | grep vgcreate | awk '{print $4}'`
+            EXCLUDE_VGS=`grep " $d" $MINDI_CACHE/i-want-my-lvm | grep vgcreate | awk '{print $4}'`
             vg=`echo $EXCLUDE_VGS | sed "s/ /|/g"`
             if [ "$vg" != "" ]; then
@@ -393 +393 @@
             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
+            grep -Ev "$re" $MINDI_CACHE/i-want-my-lvm > $MINDI_CACHE/i-want-my-lvm.new
+            mv $MINDI_CACHE/i-want-my-lvm.new $MINDI_CACHE/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/"`
+                EXCLUDE_LVS=`grep " $v" $MINDI_CACHE/i-want-my-lvm | grep lvcreate | sed "s/^.*-n \([^ ][^ ]*\) .*$/$1/"`
                 for l in $EXCLUDE_LVS; do
                     # FIXME: Should search for all possible device names here
@@ -408 +408 @@
         done
 
-        grep -E "^#.*vgchange" /tmp/i-want-my-lvm | sed "s/^#[ ]*//" > /tmp/start-lvm
+        grep -E "^#.*vgchange" $MINDI_CACHE/i-want-my-lvm | sed "s/^#[ ]*//" > /tmp/start-lvm
         chmod +x /tmp/start-lvm
         echo -en "Starting LVM's..."