Changeset 3405 in MondoRescue

Timestamp:

Aug 6, 2015, 8:10:22 AM (9 years ago)

Author:

Bruno Cornec

Message:

Improve logging

Better usage of LogIt (rarely for screen logs)
Erease templog each time as not reused

File:

• branches/3.2/mindi/mindi (modified) (13 diffs)

branches/3.2/mindi/mindi

@@ -303 +303 @@
         elif [ -e "$incoming" ] && [ $found = "false" ]; then
             if [ ! -h "$incoming" ]; then
-                tar cf - -C / $incoming 2>> $templog | (cd "$outdir" ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?" $templog
+                tar cf - -C / $incoming 2> $templog | (cd "$outdir" ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?" $templog
             else
                 tdir=`dirname "$incoming"`
@@ -651 +651 @@
             LogIt "ERROR: Cannot find mondo*restore in mondo's tempdir, $MINDI_TMP"
             LogIt "       I bet you've got a spare copy of Mondo or Mindi floating around on your system."
-            LogIt "       If Mindi was called by Mondo then send me a bug report."
+                LogIt "       If Mindi was called by Mondo then send me a bug report."
             LogIt "       It not, type 'ps ax' to see which Mondo-related process is still running then kill it. :-)"
             LogIt "       Finally, run Mindi again."
@@ -2494 +2494 @@
     rm -f $MINDI_TMP/minimal.lis $MINDI_TMP/minimal2.lis
 
-    #tar cf - $finallist 2>> $templog | tar xf - || LogIt "WARNING: Problem in minimal analysis" $templog
+    #tar cf - $finallist 2> $templog | tar xf - || LogIt "WARNING: Problem in minimal analysis" $templog
     echo "INFO: Copy the minimal env with cp -a --parents $finallist -t $mountpoint" 2>&1 >> $templog
-    cp -a --parents $finallist -t $mountpoint 2>> $templog || LogIt "WARNING: Problem in minimal analysis" $templog
+    cp -a --parents $finallist -t $mountpoint 2> $templog || LogIt "WARNING: Problem in minimal analysis" $templog
 
     # In case target /bin dir still doesn't exist, create it before using it
@@ -2510 +2510 @@
     # To improve support for distribution scripts, we now prefer to use bash as the std shell. Also fixes #600
     ln -sf /bin/bash bin/sh
-    LogIt "INFO: Using bash as default shell"
+    LogFile "INFO: Using bash as default shell"
 
     # Avoids an issue on some distro (RHEL5)
@@ -2520 +2520 @@
     if [ $? -eq 0 ]; then
         echo "udev device manager found" > $mountpoint/tmp/USE-UDEV
-        LogIt "INFO: udev device manager found"
-        tar cf - -C / /etc/udev 2>> $templog | tar xf -  || LogIt "ERROR: Problem in /etc/udev analysis" $templog
+        LogFile "INFO: udev device manager found"
+        tar cf - -C / /etc/udev 2> $templog | tar xf -  || LogIt "ERROR: Problem in /etc/udev analysis" $templog
         # This avoids NIC remapping if on another machine at restore time on Debian/Ubuntu at least
         rm -f ./etc/udev/rules.d/[z]*[0-9][0-9][-_]persistent-net.rules
         # Do not do it if it's a link (Ubuntu 64 bits #503)
         if [ -e "/lib64/udev" ] && [ ! -h "/lib64" ] && [ ! -h "/lib64/udev" ]; then
-            tar cf - -C / /lib64/udev 2>> $templog | tar xf -  || LogIt "ERROR: Problem in /lib64/udev analysis" $templog
+            tar cf - -C / /lib64/udev 2> $templog | tar xf -  || LogIt "ERROR: Problem in /lib64/udev analysis" $templog
         fi
         if [ -e "/lib32/udev" ] && [ ! -h "/lib32" ] && [  ! -h "/lib32/udev" ]; then
-            tar cf - -C / /lib32/udev 2>> $templog | tar xf -  || LogIt "ERROR: Problem in /lib32/udev analysis" $templog
+            tar cf - -C / /lib32/udev 2> $templog | tar xf -  || LogIt "ERROR: Problem in /lib32/udev analysis" $templog
         fi
         if [ -e "/lib/udev" ] && [ ! -h "/lib" ] && [  ! -h "/lib/udev" ]; then
-            tar cf - -C / /lib/udev 2>> $templog | tar xf -  || LogIt "ERROR: Problem in /lib/udev analysis" $templog
+            tar cf - -C / /lib/udev 2> $templog | tar xf -  || LogIt "ERROR: Problem in /lib/udev analysis" $templog
         fi
         if [ -e "/usr/lib/udev" ] && [ ! -h "/usr/lib" ] && [  ! -h "/usr/lib/udev" ]; then
-            tar cf - -C / /usr/lib/udev 2>> $templog | tar xf -  || LogIt "ERROR: Problem in /usr/lib/udev analysis" $templog
+            tar cf - -C / /usr/lib/udev 2> $templog | tar xf -  || LogIt "ERROR: Problem in /usr/lib/udev analysis" $templog
         fi
         if [ -x /sbin/udevd ] || [ -x /usr/bin/udevd ] || [ -x /usr/lib/systemd/systemd-udevd ]; then
@@ -2575 +2575 @@
                 fi
             done
-            #tar cf - -C / $lis `sort -u $MINDI_TMP/udev.lis` 2>> $templog | tar xf - || LogIt "ERROR: Problem in udev.lis analysis" $templog
+            #tar cf - -C / $lis `sort -u $MINDI_TMP/udev.lis` 2> $templog | tar xf - || LogIt "ERROR: Problem in udev.lis analysis" $templog
             echo "INFO: Copying udev related files with cp -a --parents $finallist -t $mountpoint/" 2>&1 >> $templog
-            cp -a --parents $finallist -t $mountpoint/ 2>> $templog  || LogIt "ERROR: Problem in udev.lis analysis" $templog
+            cp -a --parents $finallist -t $mountpoint/ 2> $templog  || LogIt "ERROR: Problem in udev.lis analysis" $templog
             rm -f $MINDI_TMP/udev.lis
         else
@@ -2595 +2595 @@
             lis=`grep -Ev '^#' $MINDI_CACHE/tools.files` 
             LocateDeps $lis > $MINDI_TMP/tools.lis
-            tar cf - $lis `sort -u $MINDI_TMP/tools.lis` 2>> $templog | tar xf - || LogIt "ERROR: Problem in tools.lis analysis" $templog
+            tar cf - $lis `sort -u $MINDI_TMP/tools.lis` 2> $templog | tar xf - || LogIt "ERROR: Problem in tools.lis analysis" $templog
         fi
         if [ -f $MINDI_CACHE/mindi-rsthw ]; then
@@ -2606 +2606 @@
     # Management of perl scripts delivered needed at restore time
     LogIt "INFO: Analyzing perl modules dependencies"
-    mindi-get-perl-modules `cat $MINDI_CONF/perl-scripts` /usr/[s]*bin/mr-* 2>> $templog > $MINDI_TMP/perl.lis || LogIt "ERROR: Problem in mindi-get-perl-modules" $templog
-    LogIt "DBG4: Perl Modules found:"
-    LogIt "-------------------------"
+    mindi-get-perl-modules `cat $MINDI_CONF/perl-scripts` /usr/[s]*bin/mr-* 2> $templog > $MINDI_TMP/perl.lis || LogIt "ERROR: Problem in mindi-get-perl-modules" $templog
+    LogFile "DBG4: Perl Modules found:"
+    LogFile "-------------------------"
     cat $MINDI_TMP/perl.lis >> $LOGFILE
-    LogIt "-------------------------"
-    tar cf - `cat $MINDI_TMP/perl.lis` 2>> $templog | tar xf - || LogIt "ERROR: Problem in perl scripts analysis" $templog
+    LogFile "-------------------------"
+    tar cf - `cat $MINDI_TMP/perl.lis` 2> $templog | tar xf - || LogIt "ERROR: Problem in perl scripts analysis" $templog
 
     for w in cdrom groovy-stuff ; do
@@ -2617 +2617 @@
     done
 
-    tar cf - -C / /dev/fd0*[1,2][4,7,8]* 2>> $templog | tar xf -  || LogIt "ERROR: Problem in fd dev analysis" $templog
+    tar cf - -C / /dev/fd0*[1,2][4,7,8]* 2> $templog | tar xf -  || LogIt "ERROR: Problem in fd dev analysis" $templog
 
     echo -en "..."
@@ -2646 +2646 @@
 
     LogFile "INFO: Adding $needed_modules to the rootfs with $mkgmopt"
-    cp --parents -aL $needed_modules $mountpoint/ 2>> $templog || LogIt "ERROR: Unable to copy modules to $mountpoint" $templog
+    cp --parents -aL $needed_modules $mountpoint/ 2> $templog || LogIt "ERROR: Unable to copy modules to $mountpoint" $templog
 
     # Uncompress modules if not using udev and native modprobe
@@ -2665 +2665 @@
 
     # Also copy modules.* in case of udev so that normal modprobe works
-    tar cf - -C / /$needed_modules_path/modules.* 2>> $templog | (cd "$mountpoint" ; tar xf -) || LogIt "ERROR: Unable to copy modules.* to $mountpoint" $templog
+    tar cf - -C / /$needed_modules_path/modules.* 2> $templog | (cd "$mountpoint" ; tar xf -) || LogIt "ERROR: Unable to copy modules.* to $mountpoint" $templog
 
     # Copy FW in case some drivers needs it
@@ -2697 +2697 @@
             lis="/usr/bin/sg_map /usr/bin/sg_inq /usr/bin/sg_reset /usr/bin/rev"
             LocateDeps $lis > $MINDI_TMP/obdr.lis
-            (cd $mountpoint ; tar cf - $lis -C /  `sort -u $MINDI_TMP/obdr.lis` 2>> $templog | tar xf - || LogIt "ERROR: Problem in obdr.lis analysis" $templog)
+            (cd $mountpoint ; tar cf - $lis -C /  `sort -u $MINDI_TMP/obdr.lis` 2> $templog | tar xf - || LogIt "ERROR: Problem in obdr.lis analysis" $templog)
             LogIt "INFO: Copying /usr/bin/sg_reset to ramdisk for improved SCSI OBDR support"
             found=1
@@ -3337 +3337 @@
     LogIt "INFO: Your $MRCFG file is:"
     LogIt "--------------------------"
-    cat $MINDI_TMP/$MRCFG >> $LOGFILE
+    cat $MINDI_TMP/$MRCFG | tee -a $LOGFILE
     LogIt "--------------------------"
 else