Changeset 1315 in MondoRescue for branches/2.2.2/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.

Location:

branches/2.2.2/mindi

Files:

• ChangeLog (modified) (1 diff)
• mindi (modified) (5 diffs)
• rootfs/sbin/LogIt (modified) (1 diff)
• rootfs/sbin/init (modified) (2 diffs)
• rootfs/sbin/install-additional-tools (modified) (2 diffs)
• rootfs/sbin/post-init (modified) (1 diff)

branches/2.2.2/mindi/ChangeLog

@@ -3 +3 @@
 MINDI CHANGES
 
-1.2.2 (2007-04-15)
+1.2.2 (2007-04-16)
+- Mindi log file is now added to mondoarchive log file to ease debug (Bruno Cornec)
 - Suppress losetup usage in start-nfs (unreliable and doesn't work with QEMU (Bruno Cornec)
 - Fix a bug where losetup is called with only one parameter (#140) (Bruno Cornec)

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

branches/2.2.2/mindi/rootfs/sbin/LogIt

@@ -11 +11 @@
 currdate=""
 
-LOGFILE=/tmp/mondo-restore.log
+if [ _"$LOGFILE" = _"" ]; then
+    echo "LOGFILE was undefined. Using /tmp/mondorestore2.log"
+    LOGFILE="/tmp/mondorestore2.log"
+fi
+
 if [ ! -e "$LOGFILE" ] ; then
     echo "...first line..." > $LOGFILE

branches/2.2.2/mindi/rootfs/sbin/init

@@ -367 +367 @@
         mount_cmd="mount /dev/shm -t tmpfs -o size=$size" ; # was 34m until 04/2003
         LogIt "Trying '$mount_cmd'"
-    $mount_cmd /tmp/tmpfs 2>> /$LOGFILE
+    $mount_cmd /tmp/tmpfs 2>> $LOGFILE
     res=$?
     [ "$res" -eq "0" ] && break
@@ -434 +434 @@
 MINDI_REV=RRR
 trap CaughtSoftReset SIGTERM
-LOGFILE=/tmp/mondo-restore.log
+LOGFILE=/tmp/mondorestore.log
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/mondo:/usr/games
 GROOVY=/tmp/groovy-stuff
 USER=root
-export PATH GROOVY USER
+export PATH GROOVY USER LOGFILE
 
 echo "Welcome to init (from mindi ${MINDI_VER}-r${MINDI_REV}"

branches/2.2.2/mindi/rootfs/sbin/install-additional-tools

@@ -43 +43 @@
     biggiefsize=`cat $stub.size`
     rm -f $stub.name $stub.size
-#    echo -e -n "\rRecombining #$biggienumber ($biggiefname)        \r"
     > /tmp/out.dat
     sliceno=0
@@ -52 +51 @@
         slicefile="$slicefile"$sliceno
         [ ! -e "$slicefile" ] && break
-#   echo "biggienumber=$biggienumber slicefile=$slicefile" >> /tmp/mondo-restore.log
         cat $slicefile >> /tmp/out.dat
         rm -f $slicefile
         sliceno=$(($sliceno+1))
         done
-#    echo "$sliceno slices"
 
-    echo "$biggiefname ($biggiefsize KB) restored. $sliceno slices." >> /tmp/mondo-restore.log
-
-#    cat $stub.[0-9]* > /tmp/out.dat
-#    rm -f $stub.*               ; # .[0-9]* for the slices, plus .name & .size
-
+    echo "$biggiefname ($biggiefsize KB) restored. $sliceno slices." >> $LOGFILE
 
     mkdir -p $biggiefname

branches/2.2.2/mindi/rootfs/sbin/post-init

@@ -57 +57 @@
 fi
 
-cat /tmp/mountlist.txt >> /tmp/mondo-restore.log
+cat /tmp/mountlist.txt >> $LOGFILE
 
 iso=`grep iso /proc/cmdline`