Changeset 2166 in MondoRescue

Timestamp:

Mar 14, 2009, 1:39:20 AM (16 years ago)

Author:

Bruno Cornec

Message:

Try to remove useless tar messages

File:

• branches/2.2.9/mindi/mindi (modified) (17 diffs)

branches/2.2.9/mindi/mindi

@@ -152 +152 @@
 
     mkdir -p $bigdir/etc
-    tar cf - -C / $mappath 2>> $LOGFILE | (cd $bigdir ; tar xf -) || LogIt "AKMF -- Could not copy $mappath to $bigdir"
+    tar cf - -C / $mappath 2>> $MINDI_TMP/$$.log | (cd $bigdir ; tar xf -) || LogIt "AKMF -- Could not copy $mappath to $bigdir" $MINDI_TMP/$$.log
     if [ "`echo $mappath | grep -F ".gz"`" ] ; then
         included_list=`gzip -dc $mappath | grep -Fi include | sed s/'"'// | sed s/'"'// | cut -d' ' -f2`
@@ -195 +195 @@
             find $incoming/* -maxdepth 0 2> /dev/null | CopyDependenciesToDirectory $outdir
         elif [ -e "$incoming" ] && [ $found = "false" ]; then
-            tar cf - -C / $incoming 2>> $LOGFILE | (cd $outdir ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
+            tar cf - -C / $incoming 2>> $MINDI_TMP/$$.log | (cd $outdir ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?" $MINDI_TMP/$$.log
 
             # Only uncompress modules if not using udevd
@@ -256 +256 @@
         LogIt "FATAL ERROR. $1"
     fi
+    if [ _"$2" != _"" ]; then
+        grep -Ev "tar: Removing \`/\'" "$2" >> $LOGFILE
+    fi
+    rm -f "$2"
 
     LogIt "Please e-mail a copy of $LOGFILE to the mailing list."
@@ -568 +572 @@
             old_pwd=`pwd`
             cd $bigdir
-            tar -zxf $MINDI_TMP/post-nuke.tgz || LogIt "Error occurred when untarring post-nuke tarball"
+            tar -zxf $MINDI_TMP/post-nuke.tgz 2>> $MINDI_TMP/$$.log || LogIt "Error occurred when untarring post-nuke tarball" $MINDI_TMP/$$.log
             cd $old_pwd
         fi
@@ -875 +879 @@
     fi
     echo -e "$1" >> $LOGFILE
+    if [ _"$2" != _"" ]; then
+        grep -Ev "tar: Removing \`/\'" "$2" >> $LOGFILE
+    fi
+    rm -f "$2"
 }
 
@@ -1827 +1835 @@
         cd $MINDI_TMP
         for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
-            tar cf - ./$i 2>> $LOGFILE | (cd $bigdir ; tar xf -) || Die "PDDI can't copy $i->$bigdir"
+            tar cf - ./$i 2>> $MINDI_TMP/$$.log | (cd $bigdir ; tar xf -) || Die "PDDI can't copy $i->$bigdir" $MINDI_TMP/$$.log
         done
         for i in $EXTRA_MODS ; do
@@ -1833 +1841 @@
             [ ! "$j" ] && echo "WARNING - cannot find failsafe module $i.o.gz" >> $LOGFILE
             for k in $j ; do
-                tar cf - $k 2>> $LOGFILE | (cd $bigdir ; tar xf -)
+                tar cf - $k 2>> $MINDI_TMP/$$.log | (cd $bigdir ; tar xf -) || LogIt "ERROR on module $k" $MINDI_TMP/$$.log
                 echo "Added failsafe module $k to ramdisk" >> $LOGFILE
             done
@@ -1889 +1897 @@
         [ "$?" -ne "0" ] && [ _"$MONDO_SHARE" != _"" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
     fi
-    [ -d "/lib/dev-state" ] && tar cf - -C / /lib/dev-state 2>> $LOGFILE | tar xf -
+    [ -d "/lib/dev-state" ] && tar cf - -C / /lib/dev-state 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "Unable to handle /lib/dev-state" $MINDI_TMP/$$.log
     cd $old_pwd
     echo -e "$DONE"
@@ -1918 +1926 @@
     echo -en "Tarring and zipping the data content..."
     size_of_all_tools=`du -sk $bigdir | cut -f1`
-    (cd $bigdir ; tar -b 4096 -cf - . 2>> $LOGFILE | gzip -9 > $imagesdir/all.tar.gz)
+    (cd $bigdir ; tar -b 4096 -cf - . 2>> $MINDI_TMP/$$.log | gzip -9 > $imagesdir/all.tar.gz || LogIt "Problem creating all.tar.gz" $MINDI_TMP/$$.log)
     du -sk $imagesdir/*gz >> $LOGFILE
     echo -e "$DONE"
@@ -2199 +2207 @@
             fi
         done
-        tar cf - $mountlis `sort -u $MINDI_TMP/busy.lis` 2>> $LOGFILE | tar xf -
+        tar cf - $mountlis `sort -u $MINDI_TMP/busy.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "Problem in mount analysis" $MINDI_TMP/$$.log
         rm -f $MINDI_TMP/busy.lis
     fi
@@ -2215 +2223 @@
         echo "udev device manager found" > $mountpoint/tmp/USE-UDEV
         LogIt "udev device manager found"
-        tar cf - -C / /etc/udev 2>> $LOGFILE | tar xf -
+        tar cf - -C / /etc/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "Problem in /etc/udev analysis" $MINDI_TMP/$$.log
         # This avoids NIC remapping if on another machine at restore time on Debian at least
         rm -f ./etc/udev/rules.d/z[0-9][0-9]_persistent-net.rules
         # This avoids NIC remapping if on another machine at restore time on Ubuntu at least
         rm -f ./etc/udev/rules.d/[0-9][0-9]-persistent-net.rules
-        tar cf - -C / /lib*/udev 2>> $LOGFILE | tar xf -
+        tar cf - -C / /lib*/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "Problem in /lib/udev analysis" $MINDI_TMP/$$.log
         if [ -x /sbin/udevd ]; then
             lis2=`grep -Ev '^#' $MINDI_CONF/udev.files` 
@@ -2246 +2254 @@
                 fi
             done
-            tar cf - -C / $lis `sort -u $MINDI_TMP/udev.lis` 2>> $LOGFILE | tar xf -
+            tar cf - -C / $lis `sort -u $MINDI_TMP/udev.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "Problem in udev.lis analysis" $MINDI_TMP/$$.log
             rm -f $MINDI_TMP/udev.lis
         else
@@ -2264 +2272 @@
             lis=`grep -Ev '^#' $MINDI_CACHE/tools.files` 
             LocateDeps $lis > $MINDI_TMP/tools.lis
-            tar cf - $lis `sort -u $MINDI_TMP/tools.lis` 2>> $LOGFILE | tar xf -
+            tar cf - $lis `sort -u $MINDI_TMP/tools.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "Problem in tools.lis analysis" $MINDI_TMP/$$.log
         fi
         if [ -f $MINDI_CACHE/mindi-rsthw ]; then
@@ -2277 +2285 @@
     done
 
-    tar cf - -C / /dev/fd0*[1,2][4,7,8]* 2>> $LOGFILE | tar xf -
+    tar cf - -C / /dev/fd0*[1,2][4,7,8]* 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "Problem in fd dev analysis" $MINDI_TMP/$$.log
 
     cd $old_pwd
@@ -2319 +2327 @@
         [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
         echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
-        tar cf - -C / $i 2>> $LOGFILE | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy $i to $mountpoint"
+        tar cf - -C / $i 2>> $MINDI_TMP/$$.log | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy $i to $mountpoint" $MINDI_TMP/$$.log
         # Uncompress modules if not using udev and native modprobe
         if [ ! -f $mountpoint/tmp/USE-UDEV ]; then
@@ -2330 +2338 @@
 
     # Also copy modules.dep in case of udev so that normal modprobe works
-    tar cf - -C / /$needed_modules_path/modules.dep 2>> $LOGFILE | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy modules.dep to $mountpoint"
+    tar cf - -C / /$needed_modules_path/modules.dep 2>> $MINDI_TMP/$$.log | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy modules.dep to $mountpoint" $MINDI_TMP/$$.log
 
     if [ ! -e "/sbin/devfsd" ] || [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] ; then
@@ -2769 +2777 @@
     cd $MINDI_TMP/small-all
     cp -f $MINDI_TMP/{mountlist.txt,mondo-restore.cfg,filelist.full.gz,biggielist.txt} tmp 2>> $LOGFILE || Die "Cannot copy small all.tar.gz"
-    tar -cv ./tmp | gzip -9 > $MINDI_TMP/all.tar.gz || Die "Cannot make small all.tar.gz"
+    tar -cv ./tmp | gzip -9 > $MINDI_TMP/all.tar.gz 2>> $MINDI_TMP/$$.log || Die "Cannot make small all.tar.gz" $MINDI_TMP/$$.log
     sleep 2
     LogIt "Done. Exiting."