Changeset 1315 in MondoRescue for branches/2.2.2/mindi/mindi

Timestamp:

Apr 16, 2007, 4:13:59 PM (17 years ago)

Author:

Bruno Cornec

Message:

Log files are now consistent: mondoarchive.log for mondoarchive (containing also mindi.log) and mondorestore.log for mondorestore (copied from /tmp (ram) to /var/log (disk) at the end of the restore)
One include has been created for each bianry containing only that declaration ofr the moment, but which will be extended to include all local definitions (ps_* e.g.)
Doc updated accordingly
LOGFILE in restore process is now passed in the environment and not duplicated anymore
LogIt is not redifined either
LOGFILE should be put in environment by mondoarchive for mindi's usage but that's a step left for later.

File:

• branches/2.2.2/mindi/mindi (modified) (5 diffs)

branches/2.2.2/mindi/mindi

@@ -430 +430 @@
     echo "Mindi $MINDI_VERSION is exiting" >> $LOGFILE
     echo "End date : `date`" >> $LOGFILE
+    if [ "`DidMondoCallMe`" ] ; then
+        cat $LOGFILE >> /var/log/mondoarchive.log
+    fi
 
     sync
@@ -452 +455 @@
     fi
 
-    # Creates a tar file containing all required files
-    for i in /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log ; do
-        [ -e "$i" ] && cp -f $i $MINDI_TMP 2>> $LOGFILE
-    done
-    rm -f $TMPDIR/mindi.err.*.tgz
-    tar -cf - $MINDI_TMP | gzip -9 > $TMPDIR/mindi.err.$$.tgz
-    LogIt "Please e-mail a copy of $TMPDIR/mindi.err.$$.tgz to the mailing list."
+    LogIt "Please e-mail a copy of $LOGFILE to the mailing list."
     LogIt "See http://www.mondorescue.org for more information."
     LogIt "WE CANNOT HELP unless you enclose that file.\n"
@@ -1356 +1353 @@
                 current_partition=$actual_dev
             else
-                Die "Your system uses a UUID partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in /etc/fstab or install findfs|blkid|vol_id"
+                Die "Your system uses a UUID partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in $MY_FSTAB or install findfs|blkid|vol_id"
             fi
         else
@@ -2892 +2889 @@
 mount >> $LOGFILE
 echo "-------------" >> $LOGFILE
+if [ -e /etc/raidtab ]; then
+    echo "-------------" >> $LOGFILE
+    echo "/etc/raidtab content:" >> $LOGFILE
+    echo "-------------" >> $LOGFILE
+    cat /etc/raidtab >> $LOGFILE
+fi
+echo "-------------" >> $LOGFILE
 echo "lsmod result:" >> $LOGFILE
 echo "-------------" >> $LOGFILE
@@ -3031 +3035 @@
     LogIt "------------------------------------------------------------------------------"
 else
-    echo "You are using Mindi-Linux v$MINDI_VERSION to make boot+data disks" >> /var/log/mondo-archive.log
+    echo "You are using Mindi-Linux v$MINDI_VERSION to make boot+data disks" >> $LOGFILE
 fi
 if [ -f $MINDI_LIB/rootfs/bin/busybox ]; then