Changeset 1326 in MondoRescue for branches/stable/mindi

Timestamp:

Apr 17, 2007, 12:08:14 AM (17 years ago)

Author:

Bruno Cornec

Message:

• MONDO_LOGFILE is rather a char* exported by each main program (consolidation of those mecanisms in .h files with ps_*)
• One include has been created for each binary containing only the specific declarations
• 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)
• Doc updated accordingly
• LOGFILE in restore process is now passed in the environment and not duplicated a nymore
• 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.
• label-partitions-as-necessary should now work correctly for LABEL and UUID (grep -w removed)
• Remove useless script compare-me

(All coming from 2.2.2) (remains changes in my-stuff.h coming later on)

File:

• branches/stable/mindi/mindi (modified) (4 diffs)

branches/stable/mindi/mindi

@@ -426 +426 @@
     echo "Mindi $MINDI_VERSION is exiting" >> $LOGFILE
     echo "End date : `date`" >> $LOGFILE
+    if [ "`DidMondoCallMe`" ] ; then
+        cat $LOGFILE >> /var/log/mondoarchive.log
+    fi
 
     sync
@@ -448 +451 @@
     fi
 
-    # Creates a tar file containing all required files
-    for i in $MY_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"
@@ -3028 +3025 @@
 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
@@ -3182 +3186 @@
     LogIt "BusyBox sources are available from http://www.busybox.net"
 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