Changeset 2341 in MondoRescue

Timestamp:

Aug 21, 2009, 2:50:32 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Option -Y documented for mondoarchive
• New Log* functions in mindi
• Fix bug in the function dealing with % analysis
• Still trying to improve screen display globally

Location:

branches/2.2.10

Files:

• mindi/mindi (modified) (108 diffs)
• mondo-doc/mondoarchive.8 (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (3 diffs)
• mondo/src/common/libmondo-files.c (modified) (1 diff)
• mondo/src/lib/mr_mem.c (modified) (1 diff)

branches/2.2.10/mindi/mindi

@@ -137 +137 @@
     [ "$KBDEPTH" -gt "128" ] && Die "Edit $MINDI_SBIN/mindi and disable FindAndAddUserKeyboardMappingFile (line 2160, approx.)"
     if [ -e "$bigdir/$mappath" ] ; then
-        echo "$mappath already added" >> $LOGFILE
+        LogFile "$mappath already added" 
         return
     elif [ -d "$bigdir/$mappath" ] ; then
@@ -143 +143 @@
         return
     fi
-    echo "Added kbd map $mappath" >> $LOGFILE
+    LogFile "Added kbd map $mappath" 
     if [ ! -e "$mappath" ] ; then
             mappath=`grep "i[3-8]86" $MINDI_TMP/keymaps.find | grep "$locale[^r][^/]" | grep -vx " *#.*"`
         if [ ! -e "$mappath" ] ; then
-            LogIt "Cannot add $mappath: kbd map file not found"
+            LogAll "Cannot add $mappath: kbd map file not found"
             return
         fi
@@ -155 +155 @@
 
     mkdir -p $bigdir/etc
-    tar cf - -C / $mappath 2>> $MINDI_TMP/$$.log | (cd $bigdir ; tar xf -) || LogIt "AKMF -- Could not copy $mappath to $bigdir" $MINDI_TMP/$$.log
+    tar cf - -C / $mappath 2>> $MINDI_TMP/$$.log | (cd $bigdir ; tar xf -) || LogAll "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`
@@ -184 +184 @@
         # Non absolute file names should not arrive till here => skipped
         if [ `echo "$incoming" | cut -c1` != '/' ]; then
-            LogIt "Unable to handle $incoming"
+            LogAll "Unable to handle $incoming"
             incoming=`ReadLine`
             continue
@@ -202 +202 @@
             # Only uncompress modules if not using udevd
             if [ "`echo "$incoming" | grep "lib/modules/.*\..*o\.gz"`" != "" ] && [ "`ps auxww | grep -v grep | grep -qw udevd`" != "" ]; then
-                gunzip -f $outdir/$incoming || LogIt "Cannot gunzip $outdir/$incoming"
+                gunzip -f $outdir/$incoming || LogAll "Cannot gunzip $outdir/$incoming"
             fi
             [ -x "$outdir" ] && StripExecutable $outdir "-$filename-"
@@ -231 +231 @@
     local my_partitions
 
-    echo "Mindi $MINDI_VERSION is exiting" >> $LOGFILE
-    echo "End date : `date`" >> $LOGFILE
+    LogFile "Mindi $MINDI_VERSION is exiting" 
+    LogFile "End date : `date`" 
     if [ _"$MONDO_SHARE" != _"" ] ; then
         echo "------------- mindi logfile included -------------------------" >> /var/log/mondoarchive.log
@@ -255 +255 @@
     local i
     if [ "$1" = "" ] ; then
-        LogIt "FATAL ERROR"
-    else
-        LogIt "FATAL ERROR. $1"
+        LogAll "FATAL ERROR"
+    else
+        LogAll "FATAL ERROR. $1"
     fi
     if [ _"$2" != _"" ]; then
@@ -264 +264 @@
     rm -f "$2"
 
-    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"
+    LogAll "Please e-mail a copy of $LOGFILE to the mailing list."
+    LogAll "See http://www.mondorescue.org for more information."
+    LogAll "WE CANNOT HELP unless you enclose that file.\n"
     MindiExit -1
 }
@@ -286 +286 @@
         vanilla_lib_name=`echo "$optimized_lib_name" | sed -e 's/i[5-7]86//' -e 's/cmov//' -e 's/nosegneg//' | tr -s '/' '/'`
         echo "$vanilla_lib_name" >> $filelist
-        echo "Adding $vanilla_lib_name to filelist" >> $LOGFILE
+        LogFile "Adding $vanilla_lib_name to filelist" 
         mkdir -p $outdir$optimized_lib_name > /dev/null 2> /dev/null
         rmdir $outdir$optimized_lib_name > /dev/null 2> /dev/null
@@ -292 +292 @@
         # This may return multiple files
         for resolved in `ReadAllLink $vanilla_lib_name`; do
-            echo "Adding as deps $resolved to filelist" >> $LOGFILE
+            LogFile "Adding as deps $resolved to filelist" 
             vanilla_resolved_name=`echo "$resolved" | sed -e 's/i[5-7]86//' -e 's/cmov//' -e 's/nosegneg//' | tr -s '/' '/'`
             mkdir -p $outdir$resolved> /dev/null 2> /dev/null
             rmdir $outdir$resolved > /dev/null 2> /dev/null
             ln -sf $vanilla_resolved_name $outdir$resolved
-            echo "Excluding deps $resolved" >> $LOGFILE
+            LogFile "Excluding deps $resolved" 
             grep -Fvx "$resolved" "$filelist" > $filelist.tmp
-            echo "Replacing it with $vanilla_resolved_name" >> $LOGFILE
+            LogFile "Replacing it with $vanilla_resolved_name" 
             echo "$vanilla_resolved_name" >> $filelist.tmp
             mv -f $filelist.tmp $filelist
@@ -312 +312 @@
 FindAndAddUserKeyboardMappingFile() {
     local r res mapfile mappath included_item included_list keyfile mp locale
-    LogIt "Analyzing your keyboard's configuration."
+    LogAll "Analyzing your keyboard's configuration."
     KEYDIR=/lib/kbd
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share/kbd     # Slackware
@@ -320 +320 @@
     [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole-setup
     if [ ! -e "$KEYDIR" ] ; then
-        LogIt "Keyboard mapping directory not found. I shall use default map at boot-time."
+        LogAll "Keyboard mapping directory not found. I shall use default map at boot-time."
         return 0
     fi
     if [ -e "/etc/sysconfig/keyboard" ] ; then
-        echo "Red Hat-style config detected." >> $LOGFILE
+        LogFile "Red Hat-style config detected." 
         keyfile=/etc/sysconfig/keyboard
     elif [ -e "/etc/rc.d/rc.keymap" ] ; then
-        echo "Slackware-style config detected." >> $LOGFILE
+        LogFile "Slackware-style config detected." 
         keyfile=/etc/rc.d/rc.keymap
     elif [ -e "/etc/rc.config" ] ; then
-        echo "Debian-style config detected." >> $LOGFILE
+        LogFile "Debian-style config detected." 
         keyfile=/etc/rc.config
     elif [ -e "/etc/console/boottime.kmap.gz" ] ; then
-        echo "Debian-style config detected." >> $LOGFILE
+        LogFile "Debian-style config detected." 
         echo -en "Adding the following keyboard mapping tables: "
         mkdir -p $bigdir/tmp
@@ -343 +343 @@
         return 0
     elif [ -e "/etc/console-setup/boottime.kmap.gz" ] ; then
-        echo "Ubuntu-style config detected." >> $LOGFILE
+        LogFile "Ubuntu-style config detected." 
         echo -en "Adding the following keyboard mapping tables: "
         mkdir -p $bigdir/tmp
@@ -353 +353 @@
         return 0
     elif [ -e "/etc/conf.d/keymaps" ] ; then
-        echo "Gentoo-style config detected." >> $LOGFILE
+        LogFile "Gentoo-style config detected." 
         keyfile=/etc/conf.d/keymaps
     else
@@ -359 +359 @@
         keyfile=`find /etc -name rc.config | head -n1`
         if [ "$keyfile" = "" ] || [ ! -e "$keyfile" ] ; then
-            LogIt "Unknown config detected. Default keyboard map will be used."
+            LogAll "Unknown config detected. Default keyboard map will be used."
             return
         else
-            echo "Found $keyfile" >> $LOGFILE
+            LogFile "Found $keyfile" 
         fi
     fi
     if [ ! -e "$KEYDIR/keymaps" ] ; then
-        LogIt "Keyboard mapping directory not found. Default keyboard map will be used."
+        LogAll "Keyboard mapping directory not found. Default keyboard map will be used."
         return
     fi
-    echo "keyfile=$keyfile" >> $LOGFILE
+    LogFile "keyfile=$keyfile" 
     locale=`grep -F KEYTABLE "$keyfile" | tr -d '"' |cut -d'=' -f2`
     [ ! "$locale" ] && locale=`grep '.map$' "$keyfile" | sed 's/^.* //'`        # Slackware
     [ ! "$locale" ] && locale=`grep -E '^KEYMAP=' "$keyfile" | tr -d '"' |cut -d'=' -f2`        # Gentoo
-    echo "locale=$locale" >> $LOGFILE
+    LogFile "locale=$locale" 
     #
     # Process the keymaps dir once for all
@@ -384 +384 @@
     echo "$mp" | grep -q " "
     if [ $? -eq 0 ]; then
-        echo "WARNING: Multiple keymaps found: $mp" | tee -a $LOGFILE
-        echo "The following one will be used" >> $LOGFILE
+        LogAll "WARNING: Multiple keymaps found: $mp" 
+        LogFile "The following one will be used" 
     fi
     for i in $mp ; do
@@ -394 +394 @@
             mappath=$(find / -name "*/kbd/keymaps/*/$locale")
     fi
-    echo "mappath = $mappath" >> $LOGFILE
+    LogFile "mappath = $mappath" 
     if [ ! -e "$mappath" ] || [ -d "$mappath" ] ; then
-        LogIt "Keyboard mapping file not found. Default keyboard map will be used."
+        LogAll "Keyboard mapping file not found. Default keyboard map will be used."
         return
     fi
@@ -419 +419 @@
     [ ! -e "$ISOLINUX" ] && ISOLINUX=`find / -name isolinux.bin | grep -x "/.*/isolinux.bin"`
     [ ! -e "$ISOLINUX" ] && Die "Please install isolinux first. If your syslinux RPM doesn't include isolinux, you may download an isolinux RPM from Mondo's website - go to http://www.mondorescue.com and click on 'Download'"
-    echo "Found isolinux.bin at $ISOLINUX" >> $LOGFILE
+    LogFile "Found isolinux.bin at $ISOLINUX" 
 }
 
@@ -432 +432 @@
     fi
     if [ ! -e "$1" ] ; then
-        LogIt "WARNING - cannot search specific path '$1'"
+        LogAll "WARNING - cannot search specific path '$1'"
         return 1
     fi
@@ -467 +467 @@
         filelist=`GenerateListForFile "$incoming"`
         r=$?
-        [ "$r" -ne "0" ] && LogIt "$incoming not found"
+        [ "$r" -ne "0" ] && LogAll "$incoming not found"
         res=$(($res+$r))
 #       echo "'$incoming' generates filelist '$filelist'" >> $LOGFILE
@@ -474 +474 @@
         done
         progress=$(($progress+1))
-        echo -en "\r\t\t\t\t\t\t\t\t"
-        i=$(($progress*100))
-        i=$(($i/$noof_lines))
-        echo -en "$i"
-        echo -en "%"
-        modres=$(($progress%4))
-        [ "$modres" -eq "0" ] && echo -en "\t/"
-        [ "$modres" -eq "1" ] && echo -en "\t-"
-        [ "$modres" -eq "2" ] && echo -en "\t\\"
-        [ "$modres" -eq "3" ] && echo -en "\t|"
+        LogProgress $progress $noof_lines
         incoming=`ReadLine`
     done
@@ -534 +525 @@
             done
             progress=$(($progress+1))
-            echo -en "\r\t\t\t\t\t\t\t\t"
-            i=$(($progress*100))
-            i=$(($i/$noof_lines))
-            echo -en "$i"
-            echo -en "%"
-            modres=$(($progress%4))
-            [ "$modres" -eq "0" ] && echo -en "\t/"
-            [ "$modres" -eq "1" ] && echo -en "\t-"
-            [ "$modres" -eq "2" ] && echo -en "\t\\"
-            [ "$modres" -eq "3" ] && echo -en "\t|"
+            LogProgress $progress $noof_lines
             incoming=`ReadLine`
         done
@@ -554 +536 @@
     progress=0
     noof_lines=`cat $tempfile | wc -l`
-    echo "---------------------------------" >> $LOGFILE
-    echo "List of dependencies:             " >> $LOGFILE
-    echo "---------------------------------" >> $LOGFILE
+    LogFile "---------------------------------" 
+    LogFile "List of dependencies:             " 
+    LogFile "---------------------------------" 
     for fname in `cat $tempfile` ; do
         echo "$fname" | tee -a $LOGFILE >> $outfile.pre
         LocateDeps $fname | tee -a $LOGFILE >> $outfile.pre
         progress=$(($progress+1))
-        echo -en "\r\t\t\t\t\t\t\t\t"
-        i=$(($progress*100))
-        i=$(($i/$noof_lines))
-        echo -en "$i"
-        echo -en "%"
-        modres=$(($progress%4))
-        [ "$modres" -eq "0" ] && echo -en "\t/"
-        [ "$modres" -eq "1" ] && echo -en "\t-"
-        [ "$modres" -eq "2" ] && echo -en "\t\\"
-        [ "$modres" -eq "3" ] && echo -en "\t|"
+        LogProgress $progress $noof_lines
     done
     if [ _"$MONDO_SHARE" != _"" ]; then
@@ -577 +550 @@
         mkdir -p $bigdir/bin
         if [ -e "$MINDI_TMP/post-nuke.tgz" ] ; then
-            LogIt "\nIncorporating post-nuke tarball"
+            LogAll "\nIncorporating post-nuke tarball"
             old_pwd=`pwd`
             cd $bigdir
-            tar -zxf $MINDI_TMP/post-nuke.tgz 2>> $MINDI_TMP/$$.log || LogIt "Error occurred when untarring post-nuke tarball" $MINDI_TMP/$$.log
+            tar -zxf $MINDI_TMP/post-nuke.tgz 2>> $MINDI_TMP/$$.log || LogAll "Error occurred when untarring post-nuke tarball" $MINDI_TMP/$$.log
             cd $old_pwd
         fi
@@ -586 +559 @@
             LocateDeps $bigdir/usr/bin/mondo*restore >> $outfile.pre
         else
-            LogIt "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.\n It not, type 'ps ax' to see which Mondo-related process is still running;\n then kill it. :-)\n Finally, run Mindi again."
+            LogAll "Cannot find mondo*restore in mondo's tempdir, $MINDI_TMP"
+            LogAll "I bet you've got a spare copy of Mondo or Mindi floating around on your system."
+            LogAll "If Mindi was called by Mondo then send me a bug report.\n It not, type 'ps ax' to see which Mondo-related process is still running;\n then kill it. :-)\n Finally, run Mindi again."
             Die "Odd."
         fi
-        cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2>> $LOGFILE || LogIt "\nMondo v1.2x defaults to LILO as the bootloader, BTW."
+        cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2>> $LOGFILE || LogAll "\nMondo v1.2x defaults to LILO as the bootloader, BTW."
         if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
-            LogIt "\nIncorporating NFS-related settings"
+            LogAll "\nIncorporating NFS-related settings"
             for r in NFS-* ISO-PREFIX ; do
                 cp -f $MINDI_TMP/$r $bigdir/tmp 2>> $LOGFILE || Die "Cannot copy $r - did you run out of disk space?"
-                echo "Copying $r to ramdisk" >> $LOGFILE
+                LogFile "Copying $r to ramdisk" 
             done
         fi
@@ -669 +642 @@
 
     # say where we are.
-    echo "  GetInitrdFilesystemToUse(): called with parameter: $lvKernelImage.\n" >> $LOGFILE
+    LogFile "  GetInitrdFilesystemToUse(): called with parameter: $lvKernelImage.\n" 
 
     # verify that file exists
@@ -683 +656 @@
         [ $lvOffset -eq 0 ] && Die "gzip magic not found in file $lvKernelImage. Terminating."
         lvOffset=`expr $lvOffset / 2`
-        echo "  GetInitrdFilesystemToUse(): gzip magic found at lvOffset $lvOffset.\n" >> $LOGFILE
+        LogFile "  GetInitrdFilesystemToUse(): gzip magic found at lvOffset $lvOffset.\n" 
 
         # scan kernel image for initrd filessystem support
@@ -701 +674 @@
 
     # say what we are using
-    echo "  GetInitrdFilesystemToUse(): Filesytem to use for initrd is $lvUseFilesystem.\n" >> $LOGFILE
+    LogFile "  GetInitrdFilesystemToUse(): Filesytem to use for initrd is $lvUseFilesystem.\n" 
 
     # return file system to use
@@ -787 +760 @@
     for module in $module_list $EXTRA_MODS ; do
         r=`find /lib/modules/$kern -type f | grep "/${module}\..*o" | tail -n1`
-        echo "module $module --> $r" >> $LOGFILE
+        LogFile "module $module --> $r" 
         [ "$r" ] && echo "$r"
         [ -f "$oss" ] && find $oss | grep -F $module
@@ -804 +777 @@
     for fname in $incoming ; do
         if [ ! -e "$fname" ] ; then
-            echo "WARNING - $fname does not exist; cannot be LDD'd." >> $LOGFILE
+            LogFile "WARNING - $fname does not exist; cannot be LDD'd." 
             if echo $fname | grep lvm &> /dev/null ; then
-                echo "This warning only affects you if you are using LVM." >> $LOGFILE
+                LogFile "This warning only affects you if you are using LVM." 
                 if echo "$MODULES" | grep lvm &> /dev/null ; then
-                    echo "I think you are, so please take heed!" >> $LOGFILE
+                    LogFile "I think you are, so please take heed!" 
                 else
-                    echo "I don't think you are, so don't worry about it." >> $LOGFILE
+                    LogFile "I don't think you are, so don't worry about it." 
                 fi
             fi
         elif [ -h "$fname" ] && [ -x "$fname" ] ; then
-            echo "$fname is softlink" >> $LOGFILE
+            LogFile "$fname is softlink" 
         else
             ldd $fname 2> /dev/null | ProcessLDD
@@ -884 +857 @@
 }
 
-
-LogIt() {
+LogProgress() {
+    local i progress modres noof_lines
+ 
+    progress=$1
+    noof_lines=$2
+
+    echo -en "\r\t\t\t\t\t\t\t\t"
+    i=$(($progress*100))
+    i=$(($i/$noof_lines))
+    echo -en "$i"
+    echo -en "%"
+    modres=$(($progress%4))
+    [ "$modres" -eq "0" ] && echo -en "\t/"
+    [ "$modres" -eq "1" ] && echo -en "\t-"
+    [ "$modres" -eq "2" ] && echo -en "\t\\"
+    [ "$modres" -eq "3" ] && echo -en "\t|"
+}
+
+# Function to log on screen only
+LogScreen() {
     if [ -e /dev/stderr ] ; then
         echo -e "$1" >> /dev/stderr
@@ -891 +882 @@
         /usr/bin/logger -s $1
     fi
+}
+
+# Function to log in log file only
+LogFile() {
+
     echo -e "$1" >> $LOGFILE
     if [ _"$2" != _"" ]; then
@@ -896 +892 @@
     fi
     rm -f "$2"
+}
+
+# Function to log in both screen and logfile
+LogAll() {
+    LogScreen "$1"
+    LogFile "$1" "$2"
 }
 
@@ -951 +953 @@
 absolute_partition old_partition_fmt current_lvolume uname skip
 
-    echo "Your raw fstab file looks like this:" >> $LOGFILE
-    echo "------------------------------------" >> $LOGFILE
+    LogFile "Your raw fstab file looks like this:" 
+    LogFile "------------------------------------" 
     cat $MY_FSTAB >> $LOGFILE
-    echo "Your mountlist will look like this:" | tee -a $LOGFILE
-    echo "-----------------------------------" >> $LOGFILE
+    LogAll "Your mountlist will look like this:" 
+    LogAll "-----------------------------------" 
 
 # scratchdir, mountlist(OUT)
@@ -1187 +1189 @@
             echo $current_lvolume | grep -q ' '
             if [ $? -eq 0 ]; then
-                echo "WARNING: Multiple Logical Volumes found. Report to dev team" >> $LOGFILE  
+                LogFile "WARNING: Multiple Logical Volumes found. Report to dev team" 
             fi
             # if it's not found, it may well be a real device such as a multipath one
@@ -1218 +1220 @@
                     [ "$items" -gt "0" ] && partition_size=$(($totalsize/$items)) || partition_size=0
                     [ "$partition_size" -lt "125000" ] && partition_size=125000
-                    echo "I'm guessing $c_p is $(($partition_size/1024))MB" >> $LOGFILE
+                    LogFile "I'm guessing $c_p is $(($partition_size/1024))MB" 
                 fi
             fi
@@ -1236 +1238 @@
         fi
         psz=$partition_size
-        echo "Examining $current_partition (mount=$partition_mountpt fmt=$partition_format psz=$psz)" >> $LOGFILE
+        LogFile "Examining $current_partition (mount=$partition_mountpt fmt=$partition_format psz=$psz)" 
         [ "$psz" != "lvm" ] && psz=$(($psz/1024))
         if [ "`echo " $IMAGE_DEVS " | grep -F " $current_partition "`" != "" ] ; then
@@ -1244 +1246 @@
             partition_size=$(($partition_size+1)); # just in case
             if [ "$partition_format" = "Linux" ] ; then
-                echo "Are you imaging a mounted swap partition? Silly..." >> $LOGFILE
-                echo "Reverting format from $old_partition_fmt to $partition_format" >> $LOGFILE
+                LogFile "Are you imaging a mounted swap partition? Silly..." 
+                LogFile "Reverting format from $old_partition_fmt to $partition_format" 
                 partition_format=$old_partition_fmt
             fi
         fi
         if [ "$EXCLUDE_DEVS" ] && [ "`echo " $EXCLUDE_DEVS " | grep -F " $current_partition "`" ] || [ "`echo " $EXCLUDE_DEVS " | grep " $current_partition "`" ] ; then
-            echo "Excluding $current_partition from mountlist" >> $LOGFILE
+            LogFile "Excluding $current_partition from mountlist" 
             continue
         fi
         if [ ! "$partition_mountpt" ] ; then
-            echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
+            LogFile "------- $FDISK -l $qq log ------------" 
             for qq in "" `find /dev/ida/c*d* ! -name '*p*' 2> /dev/null`; do
                 partition_format=`$FDISK -l $qq 2>> $LOGFILE | grep -w "$c_p" | sed 's/12/|/' | tr -s '\t' ' ' | cut -d'|' -f2 | cut -d' ' -f2-9`
                 [ "$partition_format" ] && break
             done
-            echo "------- $FDISK log end ------------" >> $LOGFILE
+            LogFile "------- $FDISK log end ------------" 
             if [ "$partition_format" = "Compaq diagnostics" ] ; then
                 partition_format="compaq"
             elif [ ! "`grep -F device /etc/raidtab 2> /dev/null | grep -w $current_partition`" ] ; then
-                LogIt "Unable to find mountpoint of $current_partition - ignoring"
+                LogAll "Unable to find mountpoint of $current_partition - ignoring"
                 continue
             fi
@@ -1276 +1278 @@
         unofficial_outstring=`printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$label"`
         if [ "$current_partition" = "" ] ; then
-            echo "Unknown partition (outstring = $unofficial_outstring)" >> $LOGFILE
+            LogFile "Unknown partition (outstring = $unofficial_outstring)" 
         elif [ "$partition_mountpt" = "" ] && [ -f "/etc/raidtab" ] ; then
             if [ "`grep -F device /etc/raidtab 2>/dev/null | grep -F $current_partition`" ] ; then
@@ -1284 +1286 @@
                 printf "%s %s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$label" >> $mountlist
             else
-                echo "Unknown mountpoint (outstring = $unofficial_outstring)" >> $LOGFILE
+                LogFile "Unknown mountpoint (outstring = $unofficial_outstring)" 
             fi
         elif [ "$partition_format" = "" ] ; then
-            echo "Unknown format (outstring = $unofficial_outstring)" >> $LOGFILE
+            LogFile "Unknown format (outstring = $unofficial_outstring)" 
         elif [ "$partition_size" = "" ] ; then
-            echo "Unknown partition size (outstring = $unofficial_outstring)" >> $LOGFILE
+            LogFile "Unknown partition size (outstring = $unofficial_outstring)" 
         elif [ "$partition_mountpt" = "/proc" ] || [ "$partition_mountpt" = "/dev/pts" ] ; then
             continue
         else
             if [ "$partition_format" = "dos" ] || [ "$partition_format" = "msdos" ] ; then
-                echo "Stupid bastard..." >> $LOGFILE
+                LogFile "Stupid bastard..." 
                 partition_format="vfat"
             fi
@@ -1322 +1324 @@
     rm -Rf $MINDI_TMP/iso
     mkdir -p $MINDI_TMP/iso/{images,archives}
-    cp -f $MINDI_CACHE/{*.gz,*.img} $MINDI_TMP/iso/images 2>> $LOGFILE || LogIt "OfferToMakeBootableISO: Cannot copy $MINDI_CACHE/*.gz to $MINDI_TMP/iso/images"
-    echo "mindi_lib = $MINDI_LIB" >> $LOGFILE
+    cp -f $MINDI_CACHE/{*.gz,*.img} $MINDI_TMP/iso/images 2>> $LOGFILE || LogAll "OfferToMakeBootableISO: Cannot copy $MINDI_CACHE/*.gz to $MINDI_TMP/iso/images"
+    LogFile "mindi_lib = $MINDI_LIB" 
     for i in memdisk memtest.bin memtest.img ; do
         j=$MINDI_LIB/$i
         k=$MINDI_TMP/iso
         if [ -e "$j" ] ; then
-            LogIt "Copying $j to $k"
+            LogAll "Copying $j to $k"
             cp -f $j $k 2>> $LOGFILE || Die "Failed to copy $j to $k"
             cp -f $j $MINDI_TMP 2>> $LOGFILE || Die "Failed to copy $j to $MINDI_TMP"
@@ -1360 +1362 @@
     fi
     if [ "$?" -ne "0" ] ; then
-        echo "----------- $ISO_CMD's errors --------------" >> $LOGFILE
+        LogFile "----------- $ISO_CMD's errors --------------" 
         cat $MINDI_TMP/mkisofs.log >> $LOGFILE
         echo "$ISO_CMD returned the following errors:-"
         cat $MINDI_TMP/mkisofs.log
-        LogIt "Failed to create ISO image."
-    else
-        echo "Created bootable ISO image at $MINDI_CACHE/mindi.iso" | tee -a $LOGFILE
+        LogAll "Failed to create ISO image."
+    else
+        LogAll "Created bootable ISO image at $MINDI_CACHE/mindi.iso" 
     fi
     rm -f $MINDI_TMP/mkisofs.log
@@ -1395 +1397 @@
     echo -en "Transforming $USBDEVICE in a Bootable device " 
     echo -en "."
-    echo "Transforming $USBDEVICE in a Bootable device"  >> $LOGFILE
-    echo "Checking $USBDEVICE" >> $LOGFILE
+    LogFile "Transforming $USBDEVICE in a Bootable device"  
+    LogFile "Checking $USBDEVICE" 
     $FDISK -l $USBDEVICE 2>> $LOGFILE 1>> $LOGFILE
     if [ $? -ne 0 ]; then
-        echo "Unable to access $USBDEVICE" | tee -a $LOGFILE
-        echo "Make sure your USB device is pluged in" | tee -a $LOGFILE
+        LogAll "Unable to access $USBDEVICE" 
+        LogAll "Make sure your USB device is pluged in" 
         exit -1
     fi
     echo -en "."
-    echo "Unmounting $USBDEVICE just in case" >> $LOGFILE
+    LogFile "Unmounting $USBDEVICE just in case" 
     umount $USBPART 2>> $LOGFILE 1>> $LOGFILE
     # If your key has no MBR it may cause an issue
     # Use dd if=mbr.bin of=$USBDEVICE or ms-sys -s $USBDEVICE
-    echo "Preparing $USBDEVICE" >> $LOGFILE
+    LogFile "Preparing $USBDEVICE" 
     $FDISK $USBDEVICE 2>> $LOGFILE 1>> $LOGFILE << EOF
 d
@@ -1426 +1428 @@
 EOF
     if [ $? -ne 0 ]; then
-        echo "Unable to create a vfat Filesystem on $USBDEVICE" | tee -a $LOGFILE
-        echo "Make sure your USB device is pluged in" | tee -a $LOGFILE
+        LogAll "Unable to create a vfat Filesystem on $USBDEVICE" 
+        LogAll "Make sure your USB device is pluged in" 
         $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
         MindiExit -1
     fi
-    echo "The USB device $USBDEVICE now looks like this:" >> $LOGFILE
+    LogFile "The USB device $USBDEVICE now looks like this:" 
     $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
     echo -en "."
-    echo "Creating a vfat filesystem on $USBPART" >> $LOGFILE
+    LogFile "Creating a vfat filesystem on $USBPART" 
     mkdosfs -F 32 $USBPART 2>&1 >> $LOGFILE
     if [ $? -ne 0 ]; then
-        echo "Unable to create a vfat filesystem on $USBPART" | tee -a $LOGFILE
-        echo "Make sure your USB device is pluged in and partitioned ($USBPART must exist on it)" | tee -a $LOGFILE
+        LogAll "Unable to create a vfat filesystem on $USBPART" 
+        LogAll "Make sure your USB device is pluged in and partitioned ($USBPART must exist on it)" 
         $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
         MindiExit -1
     fi
     echo -en "."
-    echo "Mounting $USBPART on $MINDI_TMP/usb" >> $LOGFILE
+    LogFile "Mounting $USBPART on $MINDI_TMP/usb" 
     mount $USBPART $MINDI_TMP/usb 2>> $LOGFILE
     if [ $? -ne 0 ]; then
-        echo "Unable to mount $USBPART on $MINDI_TMP/usb" | tee -a $LOGFILE
-        echo "Make sure your USB device is pluged in, partitioned and formated ($USBPART must exist on it)" | tee -a $LOGFILE
+        LogAll "Unable to mount $USBPART on $MINDI_TMP/usb" 
+        LogAll "Make sure your USB device is pluged in, partitioned and formated ($USBPART must exist on it)" 
         $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
         MindiExit -1
@@ -1453 +1455 @@
     echo -en "."
     mkdir -p $MINDI_TMP/usb/images
-    cp -f $MINDI_CACHE/*.img $MINDI_CACHE/*.gz $MINDI_TMP/usb/images 2>> $LOGFILE || LogIt "OfferToMakeBootableUSB: Cannot copy $i to $MINDI_TMP/usb/images"
+    cp -f $MINDI_CACHE/*.img $MINDI_CACHE/*.gz $MINDI_TMP/usb/images 2>> $LOGFILE || LogAll "OfferToMakeBootableUSB: Cannot copy $i to $MINDI_TMP/usb/images"
     echo -en "."
-    echo "mindi_lib = $MINDI_LIB" >> $LOGFILE
+    LogFile "mindi_lib = $MINDI_LIB" 
     for i in memdisk memtest.bin memtest.img ; do
         j=$MINDI_LIB/$i
         k=$MINDI_TMP/usb
         if [ -e "$j" ] ; then
-            LogIt "Copying $j to $k"
+            LogAll "Copying $j to $k"
             cp -f $j $k 2>> $LOGFILE || Die "Failed to copy $j to $k"
             cp -f $j $MINDI_TMP 2>> $LOGFILE || Die "Failed to copy $j to $MINDI_TMP"
@@ -1478 +1480 @@
         syslinux -s $USBPART 2>> $MINDI_TMP/syslinux.log
         if [ "$?" -ne "0" ] ; then
-            echo "----------- syslinux's errors --------------" |tee -a $LOGFILE
+            LogAll "----------- syslinux's errors --------------" |tee -a $LOGFILE
             cat $MINDI_TMP/syslinux.log |tee -a $LOGFILE
-            LogIt "Failed to create USB image."
+            LogAll "Failed to create USB image."
         else
             echo -e "$DONE"
-            echo "Created bootable USB image on $USBDEVICE" >> $LOGFILE
+            LogFile "Created bootable USB image on $USBDEVICE" 
         fi
         rm -f $MINDI_TMP/syslinux.log
     else
-        echo "No USB boot support for ia64" | tee -a $LOGFILE
+        echo "No USB boot support for ia64" 
         MindiExit -1
     fi
@@ -1631 +1633 @@
     dd if=/dev/zero of=$imagefile bs=1k count=$BOOT_SIZE &> /dev/null || Die "Cannot dd blank file"
     mkdosfs $imagefile >> $LOGFILE 2>> $LOGFILE
-    mount -t vfat -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)"
+    mount -t vfat -o loop $imagefile $mountpoint || LogAll "Cannot mount (PBDI)"
     # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
     mkdir -p $mountpoint/etc
@@ -1656 +1658 @@
     fi
 
-    echo "Copying $MINDI_TMP/initrd.img to $mountpoint..." >> $LOGFILE
+    LogFile "Copying $MINDI_TMP/initrd.img to $mountpoint..." 
     cp -f $MINDI_TMP/initrd.img $mountpoint 2>> $LOGFILE
     if [ "$?" -ne "0" ] ; then
-        LogIt "Failed to copy $MINDI_TMP/initrd.img to $mountpoint"
+        LogAll "Failed to copy $MINDI_TMP/initrd.img to $mountpoint"
         cat $MINDI_TMP/mtpt.$$ >> $LOGFILE
-        LogIt "Please unload some of your modules and try again."
+        LogAll "Please unload some of your modules and try again."
         rm -f $MINDI_TMP/mtpt.$$
-        LogIt "Cannot incorporate initrd.img in bootdisk (kernel / modules too big?)"
+        LogAll "Cannot incorporate initrd.img in bootdisk (kernel / modules too big?)"
         retval=$(($retval+1))
     fi
@@ -1679 +1681 @@
     cp -f $kernelpath $mountpoint/vmlinuz > /dev/null 2>> $LOGFILE
     if [ "$?" -ne "0" ] ; then
-        echo "Files at mountpoint ($mountpoint) :-" >> $LOGFILE
+        LogFile "Files at mountpoint ($mountpoint) :-" 
         du -sk $mountpoint/* >> $LOGFILE
-        echo "--- end of list of files ---" >> $LOGFILE
+        LogFile "--- end of list of files ---" 
         echo -en "Kernel size = `du -sk $kernelpath | cut -f1` K\nRamdisk free = $free_space K\n\
 Sorry, your kernel is too big for your image.\n" >> $LOGFILE
@@ -1687 +1689 @@
         cd $old_pwd
         umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
-        rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
+        rmdir $mountpoint || LogAll "Cannot rmdir (PBDI)"
     #   losetup /dev/loop0 -d
         [ "$imagefile" != "" ] && rm -f $imagefile
@@ -1694 +1696 @@
     free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     max_kernel_size=$(($free_space+`du -sk $kernelpath | cut -f1`))
-    echo "Free space left on image = $free_space KB" >> $LOGFILE
-    echo "Max kernel size on $BOOT_SIZE KB image (est'd) = $max_kernel_size K" >> $LOGFILE
+    LogFile "Free space left on image = $free_space KB" 
+    LogFile "Max kernel size on $BOOT_SIZE KB image (est'd) = $max_kernel_size K" 
     # make it bootable
     [ "$mountpoint" != "" ] && rm -f $mountpoint/zero
     [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint 2>> $LOGFILE
     if [ "$KERN_DISK_MADE" ] ; then
-        echo "Not running LILO. It's not that kind of disk." >> $LOGFILE
+        LogFile "Not running LILO. It's not that kind of disk." 
     fi
 
@@ -1706 +1708 @@
     umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
     echo -en "..."
-    rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
+    rmdir $mountpoint || LogAll "Cannot rmdir (PBDI)"
     if [ "$retval" -eq "0" ] ; then
         echo -en "...$DONE\n"
         if [ "$KERN_DISK_MADE" ] ; then
-            LogIt "$BOOT_SIZE KB boot disks were created OK\n"
+            LogAll "$BOOT_SIZE KB boot disks were created OK\n"
         fi
     else
         echo -en "...failed\n"
-        LogIt $BOOT_SIZE"KB boot disk was NOT created\n"
+        LogAll $BOOT_SIZE"KB boot disk was NOT created\n"
         [ "$imagefile" != "" ] && rm -f $imagefile
     fi
-    [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero"
+    [ "$retval" -ne "0" ] && LogAll "PrepareBootDiskImage() is returning nonzero"
     return $retval
 }
@@ -1738 +1740 @@
     mkdir -p $mountpoint
     dd if=/dev/zero of=$imagefile bs=1k count=$BOOT_SIZE &> /dev/null || Die "Cannot dd blank file"
-    echo "Creating vfat filesystem on $imagefile" >> $LOGFILE
+    LogFile "Creating vfat filesystem on $imagefile" 
     mkfs.vfat $imagefile >> $LOGFILE 2>> $LOGFILE
     # syslinux should be run on a  local file (doen't work through NFS Cf: #297)
@@ -1747 +1749 @@
     imagefile=$imagesdir/mindi-bootroot.$BOOT_SIZE.img
 
-    mount -t vfat -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)"
+    mount -t vfat -o loop $imagefile $mountpoint || LogAll "Cannot mount (PBDI)"
 
     # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
     MakeMessageFile > $mountpoint/message.txt
     MakeBootConfFile isolinux > $mountpoint/syslinux.cfg
-    echo "Copying $MINDI_TMP/initrd.img to $mountpoint/initrd.img..." >> $LOGFILE
+    LogFile "Copying $MINDI_TMP/initrd.img to $mountpoint/initrd.img..." 
     cp -f $MINDI_TMP/initrd.img $mountpoint/initrd.img 2>> $LOGFILE
     if [ "$?" -ne "0" ] ; then
-        LogIt "Failed to copy $MINDI_TMP/initrd.img to $mountpoint"
+        LogAll "Failed to copy $MINDI_TMP/initrd.img to $mountpoint"
         cat $MINDI_TMP/mtpt.$$ >> $LOGFILE
-        LogIt "Please unload some of your modules and try again."
+        LogAll "Please unload some of your modules and try again."
         rm -f $MINDI_TMP/mtpt.$$
-        LogIt "Cannot incorporate initrd.img in bootdisk (kernel / modules too big?)"
+        LogAll "Cannot incorporate initrd.img in bootdisk (kernel / modules too big?)"
         retval=$(($retval+1))
     fi
@@ -1774 +1776 @@
     cp -f $kernelpath $mountpoint/vmlinuz &> /dev/null
     if [ "$?" -ne "0" ] ; then
-        echo "Files at mountpoint ($mountpoint) :-" >> $LOGFILE
+        LogFile "Files at mountpoint ($mountpoint) :-" 
         du -sk $mountpoint/* >> $LOGFILE
-        echo "--- end of list of files ---" >> $LOGFILE
+        LogFile "--- end of list of files ---" 
         echo -en "Kernel size = `du -sk $kernelpath | cut -f1` K\nRamdisk free = $free_space K\n\
 Sorry, your kernel is too big for your image.\n" >> $LOGFILE
@@ -1782 +1784 @@
         cd $old_pwd
         umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
-        rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
+        rmdir $mountpoint || LogAll "Cannot rmdir (PBDI)"
 
         [ "$imagefile" != "" ] && rm -f $imagefile
@@ -1789 +1791 @@
     free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     max_kernel_size=$(($free_space+`du -sk $kernelpath | cut -f1`))
-    echo "Free space left on image = $free_space KB" >> $LOGFILE
-    echo "Max kernel size on $BOOT_SIZE KB image (est'd) = $max_kernel_size K" >> $LOGFILE
+    LogFile "Free space left on image = $free_space KB" 
+    LogFile "Max kernel size on $BOOT_SIZE KB image (est'd) = $max_kernel_size K" 
 
     # make it bootable
@@ -1798 +1800 @@
     umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
     echo -en "..."
-    rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
+    rmdir $mountpoint || LogAll "Cannot rmdir (PBDI)"
 
     if [ "$retval" -eq "0" ] ; then
@@ -1804 +1806 @@
         if [ "$KERN_DISK_MADE" ] ; then
             [ "$imagefile" != "" ] && rm -f $imagefile
-            LogIt "$BOOT_SIZE KB boot disks were created OK\n"
+            LogAll "$BOOT_SIZE KB boot disks were created OK\n"
         fi
     else
         echo -en "...failed\n"
-        LogIt $BOOT_SIZE"KB boot disk was NOT created\n"
+        LogAll $BOOT_SIZE"KB boot disk was NOT created\n"
         [ "$imagefile" != "" ] && rm -f $imagefile
     fi
-    [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero"
+    [ "$retval" -ne "0" ] && LogAll "PrepareBootDiskImage() is returning nonzero"
     return $retval
 }
@@ -1862 +1864 @@
         for i in $EXTRA_MODS ; do
             j=`find lib/modules/$FAILSAFE_KVER -name $i.*o.gz 2> /dev/null`
-            [ ! "$j" ] && echo "WARNING - cannot find failsafe module $i.o.gz" >> $LOGFILE
+            [ ! "$j" ] && LogFile "WARNING - cannot find failsafe module $i.o.gz" 
             for k in $j ; do
-                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
+                tar cf - $k 2>> $MINDI_TMP/$$.log | (cd $bigdir ; tar xf -) || LogAll "ERROR on module $k" $MINDI_TMP/$$.log
+                LogFile "Added failsafe module $k to ramdisk" 
             done
         done
@@ -1896 +1898 @@
     i=`cat $MINDI_TMP/BOOTLOADER.DEVICE 2> /dev/null`
     if [ "$i" ] ; then
-        LogIt "Backing up $i's MBR"
+        LogAll "Backing up $i's MBR"
         dd if=$i of=$bigdir/BOOTLOADER.MBR bs=446 count=1 >> $LOGFILE 2>> $LOGFILE
         sleep 1
@@ -1902 +1904 @@
         j=$i
         [ -h "$j" ] && j=`readlink -f $j`
-        LogIt "Creating /dev/boot_device ($j)"
+        LogAll "Creating /dev/boot_device ($j)"
         mkdir -p $bigdir/dev
         cp -pRdf $j $bigdir/dev/boot_device 2>> $LOGFILE || Die "Unable to create /dev/boot_device on ramdisk"
@@ -1914 +1916 @@
     if [ -d /$ti ]; then
         mkdir -p $ti
-        cp -Rdf /$ti/* $ti 2>> $LOGFILE || LogIt "WARNING - error occurred while copying terminfo"
+        cp -Rdf /$ti/* $ti 2>> $LOGFILE || LogAll "WARNING - error occurred while copying terminfo"
     fi
     if [ -e "$MONDO_SHARE/restore-scripts" ]; then
@@ -1921 +1923 @@
     fi
     if [ -d "/lib/dev-state" ]; then 
-        tar cf - -C / ./lib/dev-state 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "Unable to handle /lib/dev-state" $MINDI_TMP/$$.log
+        tar cf - -C / ./lib/dev-state 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "Unable to handle /lib/dev-state" $MINDI_TMP/$$.log
     fi
     cd $old_pwd
@@ -1951 +1953 @@
     echo -en "Tarring and zipping the data content..."
     size_of_all_tools=`du -sk $bigdir | cut -f1`
-    (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)
+    (cd $bigdir ; tar -b 4096 -cf - . 2>> $MINDI_TMP/$$.log | gzip -9 > $imagesdir/all.tar.gz || LogAll "Problem creating all.tar.gz" $MINDI_TMP/$$.log)
     du -sk $imagesdir/*gz >> $LOGFILE
     echo -e "$DONE"
@@ -2057 +2059 @@
     $AWK '{if (substr($0,0,1)!="#" || substr($0,0,3)=="#!/") {print $0;};}' $tempfile > $1
     rm -f $tempfile
-    echo "Stripped comments from $2" >> $LOGFILE
+    LogFile "Stripped comments from $2" 
 }
 
@@ -2072 +2074 @@
     if [ "$?" -eq "0" ] ; then
         cp -f $tmpfile $1 2>> $LOGFILE
-        echo "Stripped binary $2" >> $LOGFILE
+        LogFile "Stripped binary $2" 
     fi
     rm -f $tmpfile
@@ -2117 +2119 @@
             # Used by ia64
             if [ "`gzip -cd $fname | strings 2> /dev/null | grep -F "$kdate"`" = "" ] ; then
-                LogIt "Have you recompiled your kernel \"$fname\" w/o rebooting? Naughty but I'll allow it..."
+                LogAll "Have you recompiled your kernel \"$fname\" w/o rebooting? Naughty but I'll allow it..."
                 duff_kernels="$fname $duff_kernels"
             else
@@ -2125 +2127 @@
         else
             if [ "`strings $fname 2> /dev/null | grep -F "$kdate"`" = "" ] ; then
-                LogIt "Have you recompiled your kernel \"$fname\" w/o rebooting?\n Naughty but I'll allow it..."
+                LogAll "Have you recompiled your kernel \"$fname\" w/o rebooting?\n Naughty but I'll allow it..."
                 duff_kernels="$fname $duff_kernels"
             else
@@ -2137 +2139 @@
     fi
     if [ ! "$possible_kernels" ] ; then
-        LogIt "No kernel matches exactly. Are there any duff kernels?"
+        LogAll "No kernel matches exactly. Are there any duff kernels?"
         possible_kernels="$duff_kernels"
         if [ ! "$possible_kernels" ] ; then
-            LogIt "Sorry, no duff kernels either"
+            LogAll "Sorry, no duff kernels either"
         else
-            LogIt "I bet you're running Debian or Gentoo, aren't you?"
-            LogIt "Your kernel doesn't have a sane builddate. Oh well..."
+            LogAll "I bet you're running Debian or Gentoo, aren't you?"
+            LogAll "Your kernel doesn't have a sane builddate. Oh well..."
         fi
     fi
@@ -2149 +2151 @@
     noof_kernels=`CountItemsIn "$possible_kernels"`
     if [ "$noof_kernels" -eq "0" ] ; then
-        LogIt "Could not find your kernel."
+        LogAll "Could not find your kernel."
         if [ -e "/boot/vmlinuz" ] ; then
-            LogIt "Using /boot/vmlinuz as a last resort."
+            LogAll "Using /boot/vmlinuz as a last resort."
             output=/boot/vmlinuz
         else
@@ -2158 +2160 @@
     elif [ "$noof_kernels" -eq "1" ] ; then
         kernelpath=`echo "$possible_kernels" | sed s/' '//`
-        echo "Your kernel is $kernelpath (v$KERVERRUN)" >> $LOGFILE
+        LogFile "Your kernel is $kernelpath (v$KERVERRUN)" 
         output="$kernelpath"
     else
         for i in $possible_kernels ; do
             if echo $i | grep "$KERVERRUN" ; then
-                LogIt "OK, I used my initiative and found that "
-                LogIt "$i is probably your kernel. "
+                LogAll "OK, I used my initiative and found that "
+                LogAll "$i is probably your kernel. "
                 output="$i"
                 return
@@ -2171 +2173 @@
         if echo " $possible_kernels " | grep -F "/boot/vmlinuz " &> /dev/null ; then
             output=/boot/vmlinuz
-            echo "Schlomo, this one's for you." >> $LOGFILE
+            LogFile "Schlomo, this one's for you." 
         else
-            LogIt "Two or more possible kernels found. You may specify any one of them and the "
-            LogIt "boot disks will still work, probably. If one does not work, try another."
-            LogIt "$possible_kernels"
+            LogAll "Two or more possible kernels found. You may specify any one of them and the "
+            LogAll "boot disks will still work, probably. If one does not work, try another."
+            LogAll "$possible_kernels"
             echo ""
         fi
@@ -2197 +2199 @@
     dd if=/dev/zero of=$tempfile bs=1k count=$ramdisk_size &> /dev/null || Die "Not enough room for temporary ramdisk (TurnTgzIntoRdz)"
     echo -en "..."
-    echo "Creating ext2 filesystem on $tempfile" >> $LOGFILE
+    LogFile "Creating ext2 filesystem on $tempfile" 
     mke2fs -b 1024 -m 1 -i 2048 -F $tempfile >> $LOGFILE 2>> $LOGFILE || Die "Unable to create an ext2 file system on $tempfile"
     echo -en "..."
@@ -2208 +2210 @@
     # AL04Oct08: Check whether /lib64 is a link and if so explicitly create one in rootfs
     if [ -h "/lib64" ]; then
-        mkdir -p lib || LogIt "Unable to create lib in $mountpoint."
-        ln -s lib lib64 || LogIt "/lib64 is a symbolic link, but I couldn't create it in $mountpoint."
+        mkdir -p lib || LogAll "Unable to create lib in $mountpoint."
+        ln -s lib lib64 || LogAll "/lib64 is a symbolic link, but I couldn't create it in $mountpoint."
     fi
 
@@ -2240 +2242 @@
             fi
         done
-        tar cf - $mountlis `sort -u $MINDI_TMP/busy.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "Problem in mount analysis" $MINDI_TMP/$$.log
+        tar cf - $mountlis `sort -u $MINDI_TMP/busy.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "Problem in mount analysis" $MINDI_TMP/$$.log
         rm -f $MINDI_TMP/busy.lis
     fi
@@ -2255 +2257 @@
     if [ $? -eq 0 ]; then
         echo "udev device manager found" > $mountpoint/tmp/USE-UDEV
-        LogIt "udev device manager found"
-        tar cf - -C / /etc/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "Problem in /etc/udev analysis" $MINDI_TMP/$$.log
+        LogAll "udev device manager found"
+        tar cf - -C / /etc/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogAll "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>> $MINDI_TMP/$$.log | tar xf -  || LogIt "Problem in /lib/udev analysis" $MINDI_TMP/$$.log
+        tar cf - -C / /lib*/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogAll "Problem in /lib/udev analysis" $MINDI_TMP/$$.log
         if [ -x /sbin/udevd ]; then
             lis2=`grep -Ev '^#' $MINDI_CONF/udev.files` 
@@ -2287 +2289 @@
                 fi
             done
-            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
+            tar cf - -C / $lis `sort -u $MINDI_TMP/udev.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "Problem in udev.lis analysis" $MINDI_TMP/$$.log
             rm -f $MINDI_TMP/udev.lis
         else
-            echo "udevd daemon not in standard place (/sbin)" 2>&1 | tee -a $LOGFILE
-            echo "mindi will use static devices which may cause problems" 2>&1 | tee -a $LOGFILE
+            LogAll "udevd daemon not in standard place (/sbin)"
+            LogAll "mindi will use static devices which may cause problems"
             rm -f $mountpoint/tmp/USE-UDEV
         fi
@@ -2300 +2302 @@
     mindi-bkphw $MINDI_CACHE $MINDI_CONF | tee -a $LOGFILE
     if [ -d $MINDI_CACHE/bkphw ]; then
-        LogIt "Hardware Information found and saved ..."
+        LogAll "Hardware Information found and saved ..."
         cp -rp $MINDI_CACHE/bkphw .
         if [ -f $MINDI_CACHE/tools.files ]; then
             lis=`grep -Ev '^#' $MINDI_CACHE/tools.files` 
             LocateDeps $lis > $MINDI_TMP/tools.lis
-            tar cf - $lis `sort -u $MINDI_TMP/tools.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "Problem in tools.lis analysis" $MINDI_TMP/$$.log
+            tar cf - $lis `sort -u $MINDI_TMP/tools.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "Problem in tools.lis analysis" $MINDI_TMP/$$.log
         fi
         if [ -f $MINDI_CACHE/mindi-rsthw ]; then
@@ -2316 +2318 @@
     # Management of perl scripts delivered needed at restore time
     mindi-get-perl-modules `cat $MINDI_CONF/perl-scripts` > $MINDI_TMP/perl.lis
-    tar cf - `cat $MINDI_TMP/perl.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "Problem in perl scripts analysis" $MINDI_TMP/$$.log
+    tar cf - `cat $MINDI_TMP/perl.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "Problem in perl scripts analysis" $MINDI_TMP/$$.log
 
     for w in cdrom groovy-stuff ; do
@@ -2322 +2324 @@
     done
 
-    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
+    tar cf - -C / /dev/fd0*[1,2][4,7,8]* 2>> $MINDI_TMP/$$.log | tar xf -  || LogAll "Problem in fd dev analysis" $MINDI_TMP/$$.log
 
     cd $old_pwd
@@ -2351 +2353 @@
     fi
     for i in $DENY_MODS; do
-        echo "Removing $i from the list of modules to load" >> $LOGFILE
+        LogFile "Removing $i from the list of modules to load" 
         list_of_groovy_mods=`echo ${list_of_groovy_mods} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
     done
 
-    [ -e "$needed_modules_path" ] || LogIt "path $needed_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS."
+    [ -e "$needed_modules_path" ] || LogAll "path $needed_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS."
     for i in $list_of_groovy_mods ; do
         needed_modules="$needed_modules `FindSpecificModuleInPath $needed_modules_path $i`"
@@ -2363 +2365 @@
         [ -e "$i" ] && s=`du -sk $i | cut -f1` || s=""
         [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
-        echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
-        tar cf - -C / $i 2>> $MINDI_TMP/$$.log | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy $i to $mountpoint" $MINDI_TMP/$$.log
+        LogFile "Adding $i ($s KB) to the rootfs" 
+        tar cf - -C / $i 2>> $MINDI_TMP/$$.log | (cd $mountpoint ; tar xf -) || LogAll "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
             if [ "`echo "$i" | grep -F ".gz"`" ]; then
-                echo "Uncompressing $i" >> $LOGFILE
+                LogFile "Uncompressing $i" 
                 gunzip -f $mountpoint/$i
             fi
@@ -2375 +2377 @@
 
     # Also copy modules.dep in case of udev so that normal modprobe works
-    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
+    tar cf - -C / /$needed_modules_path/modules.dep 2>> $MINDI_TMP/$$.log | (cd $mountpoint ; tar xf -) || LogAll "Unable to copy modules.dep to $mountpoint" $MINDI_TMP/$$.log
 
     if [ ! -e "/sbin/devfsd" ] || [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] ; then
-        echo "Deleting devfsd daemon from ramdisk" >> $LOGFILE
-        [ ! -e "/sbin/devfsd" ] && echo "...because /sbin/devfsd not found" >> $LOGFILE
-        [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] && echo "...because kernel is failsafe" >> $LOGFILE
+        LogFile "Deleting devfsd daemon from ramdisk" 
+        [ ! -e "/sbin/devfsd" ] && LogFile "...because /sbin/devfsd not found" 
+        [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] && LogFile "...because kernel is failsafe" 
         rm -f $mountpoint/sbin/devfsd
     fi
@@ -2402 +2404 @@
     echo "$BOOT_SIZE" > $mountpoint/tmp/$BOOT_SIZE.siz
     # Determine what filesystem to use for initrd image
-    echo "Call GetInitrdFilesystemToUse() with parameter ${kernelpath} to get filesystem to use for initrd." >> $LOGFILE
+    LogFile "Call GetInitrdFilesystemToUse() with parameter ${kernelpath} to get filesystem to use for initrd." 
     gvFileSystem=`GetInitrdFilesystemToUse ${kernelpath}`
     [ -z  gvFileSystem ] && Die "GetFilesystemToUse() failed. Terminating."
@@ -2408 +2410 @@
     "ext2fs")
         # say what will be used
-        echo "Creating an ext2 initrd image..." >> $LOGFILE
+        LogFile "Creating an ext2 initrd image..." 
         # kernel expects linuxrc in ext2 filesystem
         ( cd $mountpoint && ln -sf sbin/init linuxrc )
@@ -2419 +2421 @@
         rm -f ${rdz_fname}.tmp
         # log that we are done
-        echo "...done." >> $LOGFILE
+        LogFile "...done." 
     ;;
     "initramfs")
         # say what will be used
-        echo "Creating a gzip'ed cpio (AKA initramfs) initrd image..." >> $LOGFILE
+        LogFile "Creating a gzip'ed cpio (AKA initramfs) initrd image..." 
         # make sure that cpio is there
         which cpio &> /dev/null; [ $? -eq 0 ] || Die "cpio not found. Please install package cpio and try again."
@@ -2435 +2437 @@
         umount $mountpoint || Die "Cannot unmount $tempfile"
         # log that we are done
-        echo "...done." >> $LOGFILE
+        LogFile "...done." 
     ;;
     *)
@@ -2471 +2473 @@
 
 > $LOGFILE
-echo "mindi v$MINDI_VERSION" >> $LOGFILE
-echo "$ARCH architecture detected" >> $LOGFILE
-echo "mindi called with the following arguments:" >> $LOGFILE
-echo "$@" >> $LOGFILE
-echo "Start date : `date`" >> $LOGFILE
-echo "-----------------------------" >> $LOGFILE
+LogFile "mindi v$MINDI_VERSION" 
+LogFile "$ARCH architecture detected" 
+LogFile "mindi called with the following arguments:" 
+LogFile "$@" 
+LogFile "Start date : `date`" 
+LogFile "-----------------------------" 
 
 [ -e "/sbin/mkdosfs" ] && [ ! -e "/sbin/mkfs.vfat" ] && ln -sf /sbin/mkdosfs /sbin/mkfs.vfat
@@ -2482 +2484 @@
 # Log some capital variables
 [ "$MINDI_PREFIX" = "XXX" ] && Die "Mindi has not been installed correctly."
-echo "MONDO_SHARE = $MONDO_SHARE" >> $LOGFILE
-echo "MINDI_LIB = $MINDI_LIB" >> $LOGFILE
-echo "MINDI_SBIN = $MINDI_SBIN" >> $LOGFILE
+LogFile "MONDO_SHARE = $MONDO_SHARE" 
+LogFile "MINDI_LIB = $MINDI_LIB" 
+LogFile "MINDI_SBIN = $MINDI_SBIN" 
 [ "$MINDI_CONF" = "YYY" ] && Die "Mindi has not been installed correctly."
-echo "MINDI_CONF = $MINDI_CONF" >> $LOGFILE
+LogFile "MINDI_CONF = $MINDI_CONF" 
 if [ -f $MINDI_CONFIG ]; then
-    echo "-----------------------------" >> $LOGFILE
-    echo " Mindi configuration file    " >> $LOGFILE
-    echo "-----------------------------" >> $LOGFILE
+    LogFile "-----------------------------" 
+    LogFile " Mindi configuration file    " 
+    LogFile "-----------------------------" 
     grep -Ev '^#' $MINDI_CONFIG >> $LOGFILE
-    echo "-----------------------------" >> $LOGFILE
+    LogFile "-----------------------------" 
 fi
 
@@ -2505 +2507 @@
 if which awk &> /dev/null ; then
     if ! which gawk &> /dev/null ; then
-        LogIt "You have awk but not gawk.\nPlease note that mindi works fine with a _sane_ awk binary.\nIf your awk binary misbehaves then please contact your vendor\nor distribution's mailing list for technical support.\n"
+        LogAll "You have awk but not gawk.\nPlease note that mindi works fine with a _sane_ awk binary.\nIf your awk binary misbehaves then please contact your vendor\nor distribution's mailing list for technical support.\n"
     fi
 fi
@@ -2517 +2519 @@
     PATH=$PATH:/sbin:/usr/sbin
     export PATH
-    echo "Your PATH did not include /sbin or /usr/sbin. I have fixed that, temporarily." >> $LOGFILE
-    echo "However, you may wish to ask your vendor to provide a permanent fix..." >> $LOGFILE
-    echo " Or you might like to call 'su -' instead of 'su', for example." >> $LOGFILE
+    LogFile "Your PATH did not include /sbin or /usr/sbin. I have fixed that, temporarily." 
+    LogFile "However, you may wish to ask your vendor to provide a permanent fix..." 
+    LogFile " Or you might like to call 'su -' instead of 'su', for example." 
 fi
 
@@ -2526 +2528 @@
     source $MINDI_LIB/FindDistroFailsafe
     # Log kernel image
-    LogIt "FAILSAFE kernel image to be used is: $FAILSAFE_KBIN ($FAILSAFE_KVER)"
+    LogAll "FAILSAFE kernel image to be used is: $FAILSAFE_KBIN ($FAILSAFE_KVER)"
 else
     [ -f "$MINDI_LIB/vmlinuz" ] && FAILSAFE_KVER=`strings $MINDI_LIB/vmlinuz 2> /dev/null | grep -E "2\.[46]" | cut -d' ' -f1`
@@ -2572 +2574 @@
 fi
 
-echo "LVM set to $LVM" >> $LOGFILE
-echo "----------" >> $LOGFILE
-echo "mount result:" >> $LOGFILE
-echo "-------------" >> $LOGFILE
+LogFile "LVM set to $LVM" 
+LogFile "----------" 
+LogFile "mount result:" 
+LogFile "-------------" 
 mount >> $LOGFILE
-echo "-------------" >> $LOGFILE
+LogFile "-------------" 
 if [ -e /etc/raidtab ]; then
-    echo "-------------" >> $LOGFILE
-    echo "/etc/raidtab content:" >> $LOGFILE
-    echo "-------------" >> $LOGFILE
+    LogFile "-------------" 
+    LogFile "/etc/raidtab content:" 
+    LogFile "-------------" 
     cat /etc/raidtab >> $LOGFILE
 fi
-echo "-------------" >> $LOGFILE
-echo "cat $CMDLINE" >> $LOGFILE
-echo "-------------" >> $LOGFILE
+LogFile "-------------" 
+LogFile "cat $CMDLINE" 
+LogFile "-------------" 
 cat $CMDLINE >> $LOGFILE
-echo "-------------" >> $LOGFILE
-echo "cat /proc/swaps:" >> $LOGFILE
-echo "-------------" >> $LOGFILE
+LogFile "-------------" 
+LogFile "cat /proc/swaps:" 
+LogFile "-------------" 
 cat /proc/swaps >> $LOGFILE
-echo "-------------" >> $LOGFILE
-echo "cat /proc/partitions:" >> $LOGFILE
-echo "-------------" >> $LOGFILE
+LogFile "-------------" 
+LogFile "cat /proc/partitions:" 
+LogFile "-------------" 
 cat /proc/partitions >> $LOGFILE
-echo "-------------" >> $LOGFILE
-echo "cat /proc/filesystems:" >> $LOGFILE
-echo "-------------" >> $LOGFILE
+LogFile "-------------" 
+LogFile "cat /proc/filesystems:" 
+LogFile "-------------" 
 cat /proc/filesystems >> $LOGFILE
-echo "-------------" >> $LOGFILE
-echo "lsmod result:" >> $LOGFILE
-echo "-------------" >> $LOGFILE
+LogFile "-------------" 
+LogFile "lsmod result:" 
+LogFile "-------------" 
 lsmod >> $LOGFILE
 MODULES="`cat /proc/modules | awk '{print $1}'`"
 if [ -x /usr/sbin/esxcfg-module ]; then
-    echo "-------------" >> $LOGFILE
-    echo "VMWare ESX server detected - Enabling dedicated support" >> $LOGFILE
-    echo "-------------" >> $LOGFILE
-    echo "VMWare modules" >> $LOGFILE
-    echo "-------------" >> $LOGFILE
+    LogFile "-------------" 
+    LogFile "VMWare ESX server detected - Enabling dedicated support" 
+    LogFile "-------------" 
+    LogFile "VMWare modules" 
+    LogFile "-------------" 
     /usr/sbin/esxcfg-module -l >> $LOGFILE
     MODULES="$MODULES `/usr/sbin/esxcfg-module -l | awk '{print $1}'`"
 fi
-echo "FORCE_MODS:" >> $LOGFILE
-echo "-------------" >> $LOGFILE
-echo $FORCE_MODS >> $LOGFILE
-echo "-------------" >> $LOGFILE
-echo "DENY_MODS:" >> $LOGFILE
-echo "-------------" >> $LOGFILE
-echo $DENY_MODS >> $LOGFILE
-echo "-------------" >> $LOGFILE
-echo "df result:" >> $LOGFILE
-echo "----------" >> $LOGFILE
+LogFile "FORCE_MODS:" 
+LogFile "-------------" 
+LogFile $FORCE_MODS 
+LogFile "-------------" 
+LogFile "DENY_MODS:" 
+LogFile "-------------" 
+LogFile $DENY_MODS 
+LogFile "-------------" 
+LogFile "df result:" 
+LogFile "----------" 
 df -T >> $LOGFILE
-echo "-------------" >> $LOGFILE
-echo "Liste of extra modules is:" >> $LOGFILE
-echo "$EXTRA_MODS" >> $LOGFILE
-echo "-------------" >> $LOGFILE
+LogFile "-------------" 
+LogFile "Liste of extra modules is:" 
+LogFile "$EXTRA_MODS" 
+LogFile "-------------" 
 
 # Compute libata version
@@ -2636 +2638 @@
     if [ "$laver" = "2" ]; then
         DENY_MODS="$DENY_MODS ide-generic"
-        echo "ide-generic removed from module list as your system uses libata v2+" >> $LOGFILE
-        echo "-------------" >> $LOGFILE
+        LogFile "ide-generic removed from module list as your system uses libata v2+" 
+        LogFile "-------------" 
     fi
 fi
@@ -2723 +2725 @@
 ###
         kernelname=`echo $kernelpath | cut -d'-' -f2-`
-        LogIt "kernelname = $kernelname"
-        LogIt "kernelpath = $kernelpath"
+        LogAll "kernelname = $kernelname"
+        LogAll "kernelpath = $kernelpath"
         if [ ! -d "/lib/modules/$kernelname" ] && [ "$kernelpath" != "FAILSAFE" ]
         then
-           LogIt "Module path for ${kernelpath} not found..."
-           LogIt "using running kernel\'s modules."
+           LogAll "Module path for ${kernelpath} not found..."
+           LogAll "using running kernel\'s modules."
            kernelname=$KERVERRUN
         else
-           LogIt "Using modules for kernel: ${kernelname}"
+           LogAll "Using modules for kernel: ${kernelname}"
         fi
 ###
@@ -2748 +2750 @@
         if [ "${11}" ] ; then
             LILO_OPTIONS=""
-    #       LogIt "LILO will use conservative settings, to be compatible with older BIOSes."
+    #       LogAll "LILO will use conservative settings, to be compatible with older BIOSes."
         fi
         LAST_FILELIST_NUMBER=${12}
@@ -2765 +2767 @@
         [ "$USE_LZMA" = "" ] && USE_LZMA=no
         [ "$NOT_BOOT" = "" ] && NOT_BOOT=no
-        [ "$TAPEDEV" ] && LogIt "This is a tape-based backup. Fine."
+        [ "$TAPEDEV" ] && LogAll "This is a tape-based backup. Fine."
         [ "$kernelpath" = "" ] && kernelpath=`TryToFindKernelPath`
         kernelname=`echo $kernelpath | cut -d'-' -f2-`
         if [ ! -d "/lib/modules/$kernelname" ] && [ "$kernelpath" != "FAILSAFE" ]
         then
-           LogIt "Module path for ${kernelpath} not found..."
-           LogIt "using running kernel\'s modules."
+           LogAll "Module path for ${kernelpath} not found..."
+           LogAll "using running kernel\'s modules."
            kernelname=$KERVERRUN
         else
-           LogIt "Using modules for kernel: ${kernelname}"
+           LogAll "Using modules for kernel: ${kernelname}"
         fi
         # MONDO_ROOT is the real scratchdir
@@ -2784 +2786 @@
         fi
     else
-        echo "Syntax: mindi (--custom ....)" >> /dev/stderr
+        LogScreen "Syntax: mindi (--custom ....)"
         MindiExit -1
     fi
@@ -2797 +2799 @@
 
 if [ _"$MONDO_SHARE" = _"" ]; then
-    LogIt "Mindi Linux mini-distro generator v$MINDI_VERSION"
-    LogIt "Latest Mindi is available from http://www.mondorescue.org"
-    LogIt "BusyBox sources are available from http://www.busybox.net"
-    LogIt "------------------------------------------------------------------------------"
+    LogAll "Mindi Linux mini-distro generator v$MINDI_VERSION"
+    LogAll "Latest Mindi is available from http://www.mondorescue.org"
+    LogAll "BusyBox sources are available from http://www.busybox.net"
+    LogAll "------------------------------------------------------------------------------"
 else
-    echo "You are using Mindi-Linux v$MINDI_VERSION to make boot+data disks" >> $LOGFILE
+    LogFile "You are using Mindi-Linux v$MINDI_VERSION to make boot+data disks" 
 fi
 if [ -f $MINDI_LIB/rootfs/bin/busybox ]; then
-    LogIt "Mindi-`$MINDI_LIB/rootfs/bin/busybox 2>&1 | head -1`"
+    LogAll "Mindi-`$MINDI_LIB/rootfs/bin/busybox 2>&1 | head -1`"
 else
-    LogIt "Unable to find mindi-busybox, please install it"
+    LogAll "Unable to find mindi-busybox, please install it"
     MindiExit -1
 fi
@@ -2819 +2821 @@
 KERN_DISK_MADE=""
 
-echo "DIFFERENTIAL = $DIFFERENTIAL" >> $LOGFILE
-echo "INTERNAL TAPE BLOCK SIZE = $INTERNAL_TAPE_BLOCK_SIZE" >> $LOGFILE
-echo "NOT_BOOT = '$NOT_BOOT'" >> $LOGFILE
+LogFile "DIFFERENTIAL = $DIFFERENTIAL" 
+LogFile "INTERNAL TAPE BLOCK SIZE = $INTERNAL_TAPE_BLOCK_SIZE" 
+LogFile "NOT_BOOT = '$NOT_BOOT'" 
 if [ "$NOT_BOOT" != "" ] && [ "$NOT_BOOT" != "0" ] && [ "$NOT_BOOT" != "no" ] ; then
-    LogIt "Just creating mondo-restore.cfg and a small all.tar.gz for Mondo. Nothing else."
+    LogAll "Just creating mondo-restore.cfg and a small all.tar.gz for Mondo. Nothing else."
     MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg
     MakeMountlist $MINDI_TMP/mountlist.txt
@@ -2831 +2833 @@
     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."
+    LogAll "Done. Exiting."
     MindiExit 0
 fi
 
 if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ "$USBDEVICE" != "" ]; then
-    LogIt "Including the generation of a Bootable USB device on $USBDEVICE"
+    LogAll "Including the generation of a Bootable USB device on $USBDEVICE"
 fi
 
@@ -2864 +2866 @@
         source $MINDI_LIB/FindDistroFailsafe
         # Log kernel image
-        LogIt "FAILSAFE kernel image to be used is: $FAILSAFE_KBIN ($FAILSAFE_KVER)"
+        LogAll "FAILSAFE kernel image to be used is: $FAILSAFE_KBIN ($FAILSAFE_KVER)"
         kernelpath="$FAILSAFE_KBIN"
-        LogIt "I shall include a failsafe kernel, not your kernel, in the boot disks.\n"
-        LogIt "The failsafe kernel is $kernelpath.\n"
-        LogIt "However, you are still running your kernel. If Mindi fails to create your\n"
-        LogIt "disks then it may still be a result of a problem with your kernel.\n"
+        LogAll "I shall include a failsafe kernel, not your kernel, in the boot disks.\n"
+        LogAll "The failsafe kernel is $kernelpath.\n"
+        LogAll "However, you are still running your kernel. If Mindi fails to create your\n"
+        LogAll "disks then it may still be a result of a problem with your kernel.\n"
         pwd=`pwd`
         cd $MINDI_TMP
@@ -2877 +2879 @@
     else
         kernelpath=$MINDI_LIB/vmlinuz
-        LogIt "I shall include Mindi's failsafe kernel, not your kernel, in the boot disks."
-        LogIt "However, you are still running your kernel. If Mindi fails to create your"
-        LogIt "disks then it may still be a result of a problem with your kernel."
+        LogAll "I shall include Mindi's failsafe kernel, not your kernel, in the boot disks."
+        LogAll "However, you are still running your kernel. If Mindi fails to create your"
+        LogAll "disks then it may still be a result of a problem with your kernel."
         pwd=`pwd`
         cd $MINDI_TMP
@@ -2887 +2889 @@
     YOUR_KERNEL_SUCKS="Your kernel sucks"
 fi
-echo -e "Mindi's temp dir = $MINDI_TMP \nMindi's output dir=$MINDI_CACHE" >> $LOGFILE
-[ "$(($RANDOM%64))" -eq "0" ] && LogIt "Dude, I've looked inside your computer and it's really dusty..."
+LogFile "Mindi's temp dir=$MINDI_TMP"
+LogFile "Mindi's output dir=$MINDI_CACHE" 
+[ "$(($RANDOM%64))" -eq "0" ] && LogAll "Dude, I've looked inside your computer and it's really dusty..."
 
 [ "$YOUR_KERNEL_SUCKS" ] && [ ! "$FAILSAFE_KVER" ] && Die "Please install mindi-kernel package. You need it.\nGo to http://www.mondorescue.org and download it, then install it."
@@ -2898 +2901 @@
 export ramdisk_size=$rds
 
-echo "Ramdisk will be $ramdisk_size KB" >> $LOGFILE
+LogFile "Ramdisk will be $ramdisk_size KB" 
 if [ "$ARCH" = "ia64" ] ; then
     PrepareBootDiskImage_LILO $kernelpath || Die "Failed to create ia64 image disk image."
@@ -2914 +2917 @@
         OfferToMakeBootableUSB
     fi
-    LogIt "Finished."
+    LogAll "Finished."
 elif [ "$TAPEDEV" ] ; then
     if [ "$ARCH" != "ia64" ] ; then
@@ -2937 +2940 @@
 fi
 # cleanup
-LogIt "$FRIENDLY_OUTSTRING"
+LogAll "$FRIENDLY_OUTSTRING"
 for mtpt in $FLOPPY_WAS_MOUNTED ; do
     mount $mtpt

branches/2.2.10/mondo-doc/mondoarchive.8

@@ -274 +274 @@
 
 .TP
+.BI "-Y "
+Use lzma, the new quicker and optimized Linux compression engine, instead of bzip2.
+
+.TP
 .BI "-R "
 EXPERIMENTAL. Do not use in mission-critical environments. Star is an alternative to afio. Mondo now supports POSIX ACLs and extended attributes, so -R is essentially redundant for now.

branches/2.2.10/mondo/src/common/libmondo-archive.c

@@ -545 +545 @@
     }
 
-    mvaddstr_and_log_it(g_currentY, 0, "Calling MINDI to create boot+data disks");
     mr_asprintf(tmp, "%s/filelist.full", bkpinfo->tmpdir);
     if (!does_file_exist(tmp)) {
@@ -840 +839 @@
 11=\"%s\" 12=%s 13=%ld 14=\"%s\" 15=\"%s\" 16=\"%s\" 17=\"%s\" 18=%ld 19=%d",*/
     mr_asprintf(command, "mindi %s --custom %s %s/images '%s' '%s' '%s' %ld '%s' '%s' '%s' \
-'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s' >> %s", 
+'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s' '%s' >> %s", 
             tmp2,               // parameter #1
             bkpinfo->tmpdir,    // parameter #2
@@ -886 +885 @@
 //  popup_and_OK("Pausing");
 
+    mvaddstr_and_log_it(g_currentY, 0, "Calling MINDI to create boot+data disks");
     res = run_external_binary_with_percentage_indicator_NEW("Generating boot+data disks", command);
     paranoid_free(command);

branches/2.2.10/mondo/src/common/libmondo-files.c

@@ -448 +448 @@
     }
 
-    for (p--; isdigit(p) && p != lastline; p--);
+    for (p--; isdigit(*p) && p != lastline; p--);
     if (p != lastline) {
         p++;

branches/2.2.10/mondo/src/lib/mr_mem.c

@@ -118 +118 @@
  */
 void mr_strcat_int(char **in, int line, const char *file, const char *fmt, ...) {
-    char *p = NULL;
     char *fmt2 = NULL;
     va_list args;