Changeset 979 in MondoRescue for trunk

Timestamp:

Nov 26, 2006, 12:35:32 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r954:978 $SVN_M/branches/stable

Location:

trunk

Files:

• mindi/analyze-my-lvm (modified) (2 diffs)
• mindi/mindi (modified) (104 diffs)
• mondo-doc/mindi.8 (modified) (1 diff)
• mondo-doc/mondorescue-howto.sgml (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)
• mondo/src/common/libmondo-stream.c (modified) (1 diff)

trunk/mindi/analyze-my-lvm

@@ -37 +37 @@
 Die() {
     echo "$1" >> /dev/stderr
-    exit 1
+    exit -1
 }
 
@@ -217 +217 @@
 
 # -------------------------------- main -----------------------------------
-which lvmdiskscan 2>/dev/null 2>&1 || Die "Cannot find lvmdiskscan. Are you sure you're using LVM?"
+which lvmdiskscan 2>/dev/null 2>&1 || Die "lvmdiskscan not found. Won't handle LVM."
 if [ -e "/proc/lvm/global" ] && [ "`tr -s '\t' ' ' < /proc/lvm/global | grep "0 VGs 0 PVs 0 LVs"`" != "" ] ; then
     exit 0

trunk/mindi/mindi

@@ -113 +113 @@
 mkdir -p $MINDI_TMP
 
-FDISKLOG=$MINDI_TMP/parted2fdisk.log
-
 # Purge from potential old run
 rm -rf $CACHE_LOC/* 2> /dev/null
@@ -192 +190 @@
     if [ ! -e "$filename" ] ; then
         if [ -h "$filename" ] ; then
-            cp --parents -pRdf $filename $minidir_root/$diskno
+            cp --parents -pRdf $filename $minidir_root/$diskno 2>> $LOGFILE
             return $noof_disks
         else
@@ -203 +201 @@
         mkdir -p $minidir_root/$diskno
         filesize=`du -sk $filename | cut -f1`
-        cp --parents -Rdf $filename $minidir_root/$diskno
+        cp --parents -Rdf $filename $minidir_root/$diskno 2>> $LOGFILE
         if [ "$filesize" -le "4" ] ; then
             siz=$filesize
@@ -242 +240 @@
         mappath=`find $KEYDIR/keymaps | grep "i[3-8]86" | grep "$locale[^r][^/]" | grep -vx " *#.*"`
         if [ ! -e "$mappath" ] ; then
-            LogIt "Cannot add $mappath: kbd map file not found\n"
+            LogIt "Cannot add $mappath: kbd map file not found"
             return
         fi
@@ -250 +248 @@
 
     mkdir -p $bigdir/etc
-    cp --parents -pRdf $mappath $bigdir || LogIt "AKMF -- Could not copy $mappath to $bigdir\n"
+    cp --parents -pRdf $mappath $bigdir 2>> $LOGFILE || LogIt "AKMF -- Could not copy $mappath to $bigdir"
     if [ "`echo $mappath | grep -F ".gz"`" ] ; then
         included_list=`gzip -dc $mappath | grep -Fi include | sed s/'"'// | sed s/'"'// | cut -d' ' -f2`
@@ -282 +280 @@
     sliceno=0
     scratchfile=$MINDI_TMP/blah.$$.dat
-    cp -f $filename $scratchfile || Die "CUACF -- cannot copy $filename to $scratchfile - did you run out of disk space?"
+    cp -f $filename $scratchfile 2>> $LOGFILE || Die "CUACF -- cannot copy $filename to $scratchfile - did you run out of disk space?"
     [ "`head $scratchfile -n1 | grep -F "bin/sh"`" != "" ] && StripComments $scratchfile "-$filename-"
     [ "`echo "$filename" | grep -F "etc/termcap"`" != "" ] && StripComments $scratchfile "-$filename-"
     if [ "`echo "$filename" | grep -F "lib/modules/" | grep "\.*o\.gz"`" != "" ] ; then
         mv $scratchfile $scratchfile.gz
-        gunzip -f $scratchfile || LogIt "Cannot gunzip $scratchfile.gz\n"
+        gunzip -f $scratchfile || LogIt "Cannot gunzip $scratchfile.gz"
         filename=`echo "$filename" | tr '.' '#' | sed s/#o#gz/#o/ | sed s/#ko#gz/#ko/ | tr '#' '.'`
     fi
@@ -296 +294 @@
     [ -x "$scratchfile" ] && StripExecutable $scratchfile "-$filename-"
     while [ "$sliceno" -le "$noof_slices" ] ; do
-        dd if=$scratchfile skip=$(($sliceno*$slicesize)) of=$outdir/slice-$biggienumber.`printf "%03d" $sliceno` bs=1k count=$slicesize 2> /dev/null
+        dd if=$scratchfile skip=$(($sliceno*$slicesize)) of=$outdir/slice-$biggienumber.`printf "%03d" $sliceno` bs=1k count=$slicesize &> /dev/null
         sliceno=$(($sliceno+1))
     done
@@ -311 +309 @@
     if [ $liloc ]; then
         if ! [ `strings $liloc | grep "boot\.b"` ]; then
-            LogIt "boot.b files built into lilo; I'll create a dummy.\n"
+            LogIt "boot.b files built into lilo; I'll create a dummy."
             > $copy_to
             return 0
@@ -320 +318 @@
         copy_from=`grep install= /etc/lilo.conf | grep "\.b" | cut -d'=' -f2`
         if [ ! -f "$copy_from" ] ; then
-            LogIt "Nor can I find it from your /etc/lilo.conf file. This is very odd.\n"
+            LogIt "Nor can I find it from your /etc/lilo.conf file. This is very odd."
             copy_from=`FindSensibleBootBFile`
-            LogIt "I'm going to use '$copy_from'\n"
-        fi
-    fi
-    cp -f $copy_from $copy_to || LogIt "CBBF -- warning -- cannot find your boot.b file. That's it, I quit... (j/k)\n"
+            LogIt "I'm going to use '$copy_from'"
+        fi
+    fi
+    cp -f $copy_from $copy_to 2>> $LOGFILE || LogIt "CBBF -- warning -- cannot find your boot.b file. That's it, I quit... (j/k)"
 }
 
@@ -346 +344 @@
                 cp --parents -Rdf $incoming $outdir 2> /dev/null || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
                 if [ "`echo "$incoming" | grep "lib/modules/.*\..*o\.gz"`" != "" ] ; then
-                    gunzip -f $outdir/$incoming || LogIt "Cannot gunzip $outdir/$incoming\n"
+                    gunzip -f $outdir/$incoming || LogIt "Cannot gunzip $outdir/$incoming"
                 fi
                 [ -x "$outdir" ] && StripExecutable $outdir "-$filename-"
@@ -390 +388 @@
     done
     echo -e "$DONE"
-    LogIt "$comment has been written.\n"
+    LogIt "$comment has been written."
 }
 
@@ -415 +413 @@
     while [ "$diskno" -le "$noof_disks" ] ; do
         echo -en "#$diskno..."
-        cp -f $tardir/$diskno.tar.gz $outdir || LogIt "[line 424] Cannot copy $tardir/$diskno.tar.gz to $outdir\n"
+        cp -f $tardir/$diskno.tar.gz $outdir 2>> $LOGFILE || LogIt "[line 424] Cannot copy $tardir/$diskno.tar.gz to $outdir"
         CreateOneDataDiskImage $tardir/$diskno.tar.gz $outdir/mindi-data-$diskno.img $diskno $noof_disks
         diskno=$(($diskno+1))
@@ -435 +433 @@
     mountpoint=$MINDI_TMP/mountpoint.$$
     mkdir -p $mountpoint
-    dd if=/dev/zero of=$imagefile bs=1k count=1440 &> /dev/null || LogIt "Cannot dd (CODI)\n"
-    mke2fs -N 12 -F $imagefile > $MINDI_TMP/mke2fs.$$ 2>> $MINDI_TMP/mke2fs.$$
-    [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.$$
-    rm -f $MINDI_TMP/mke2fs.$$
+    dd if=/dev/zero of=$imagefile bs=1k count=1440 &> /dev/null || LogIt "Cannot dd (CODI)"
+    mke2fs -N 12 -F $imagefile >> $LOGFILE 2>> $LOGFILE
     mount -t ext2 -o loop $imagefile $mountpoint || Die "Can't loopmount $imagefile to $mountpoint! The reason may be missing support for loopfs or ext2 (or both) in the running kernel."
     mv $tarball $mountpoint/
@@ -446 +442 @@
     fi
     [ "$diskno" -eq "$noof_disks" ] && echo "This is the last disk ($diskno=$noof_disks)" >> $mountpoint/LAST-DISK
-    umount $mountpoint || LogIt "Cannot umount (CODI)\n"
-    rmdir $mountpoint || LogIt "Cannot rmdir (CODI)\n"
+    umount $mountpoint || LogIt "Cannot umount (CODI)"
+    rmdir $mountpoint || LogIt "Cannot rmdir (CODI)"
 }
 
@@ -484 +480 @@
     local i
     if [ "$1" = "" ] ; then
-        LogIt "Fatal error\n"
-    else
-        LogIt "Fatal error. $1\n"
+        LogIt "FATAL ERROR"
+    else
+        LogIt "FATAL ERROR. $1"
     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
+        [ -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.\n"
-    LogIt "See http://www.mondorescue.org for more information.\n"
+    LogIt "Please e-mail a copy of $TMPDIR/mindi.err.$$.tgz to the mailing list."
+    LogIt "See http://www.mondorescue.org for more information."
     LogIt "WE CANNOT HELP unless you enclose that file.\n"
     MindiExit -1
@@ -538 +534 @@
 FindAndAddUserKeyboardMappingFile() {
     local r res mapfile mappath included_item included_list keyfile mp locale
-    LogIt "Analyzing your keyboard's configuration.\n"
+    LogIt "Analyzing your keyboard's configuration."
     KEYDIR=/lib/kbd
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share/kbd     # Slackware
@@ -544 +540 @@
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share
     if [ ! -e "$KEYDIR" ] ; then
-        LogIt "Keyboard mapping directory not found. I shall use default map at boot-time.\n"
+        LogIt "Keyboard mapping directory not found. I shall use default map at boot-time."
         return 0
     fi
@@ -563 +559 @@
         KBDEPTH=0
         mkdir -p $bigdir/etc/console
-        cp /etc/console/boottime.kmap.gz $bigdir/etc/console
+        cp /etc/console/boottime.kmap.gz $bigdir/etc/console 2>> $LOGFILE
         echo -e "$DONE"
         return 0
@@ -570 +566 @@
         keyfile=`find /etc -name rc.config | head -n1`
         if [ "$keyfile" = "" ] || [ ! -e "$keyfile" ] ; then
-            LogIt "Unknown config detected. Default keyboard map will be used.\n"
+            LogIt "Unknown config detected. Default keyboard map will be used."
             return
         else
@@ -577 +573 @@
     fi
     if [ ! -e "$KEYDIR/keymaps" ] ; then
-        LogIt "Keyboard mapping directory not found. Default keyboard map will be used.\n"
+        LogIt "Keyboard mapping directory not found. Default keyboard map will be used."
         return
     fi
@@ -601 +597 @@
     echo "mappath = $mappath" >> $LOGFILE
     if [ ! -e "$mappath" ] || [ -d "$mappath" ] ; then
-        LogIt "Keyboard mapping file not found. Default keyboard map will be used.\n"
+        LogIt "Keyboard mapping file not found. Default keyboard map will be used."
         return
     fi
@@ -639 +635 @@
         if which lilo.real > /dev/null 2> /dev/null ; then
             LILO_EXE=lilo.real
-            LogIt "lilo.real found; will be used instead of lilo (*grumble* *mutter*)\n"
+            LogIt "lilo.real found; will be used instead of lilo (*grumble* *mutter*)"
         else
             LILO_EXE=lilo
@@ -693 +689 @@
     fi
     if [ ! -e "$1" ] ; then
-        LogIt "Warning - cannot search specific path '$1'\n"
+        LogIt "WARNING - cannot search specific path '$1'"
         return 1
     fi
@@ -728 +724 @@
         filelist=`GenerateListForFile "$incoming"`
         r=$?
-        [ "$r" -ne "0" ] && LogIt "$incoming not found\n"
+        [ "$r" -ne "0" ] && LogIt "$incoming not found"
         res=$(($res+$r))
 #       echo "'$incoming' generates filelist '$filelist'" >> $LOGFILE
@@ -835 +831 @@
         mkdir -p $bigdir/bin
         if [ -e "$MINDI_TMP/post-nuke.tgz" ] ; then
-            LogIt "\nIncorporating post-nuke tarball\n"
+            LogIt "\nIncorporating post-nuke tarball"
             old_pwd=`pwd`
             cd $bigdir
-            tar -zxf $MINDI_TMP/post-nuke.tgz || LogIt "Error occurred when untarring post-nuke tarball\n"
+            tar -zxf $MINDI_TMP/post-nuke.tgz || LogIt "Error occurred when untarring post-nuke tarball"
             cd $old_pwd
         fi
-        if cp -f $MINDI_TMP/mondo*restore $bigdir/usr/bin ; then
+        if cp -f $MINDI_TMP/mondo*restore $bigdir/usr/bin 2>> $LOGFILE ; then
             LocateDeps $bigdir/usr/bin/mondo*restore >> $outfile.pre
         else
-            LogIt "Cannot find mondo*restore in mondo's tempdir, $MINDI_TMP\n"
-            LogIt "I bet you've got a spare copy of Mondo or Mindi floating around on your system.\n"
+            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."
             Die "Odd."
         fi
-        cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2> /dev/null || LogIt "\nMondo v1.2x defaults to LILO as the bootloader, BTW.\n"
+        cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2> /dev/null || LogIt "\nMondo v1.2x defaults to LILO as the bootloader, BTW."
         if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
-            LogIt "Incorporating NFS-related settings\n"
+            LogIt "Incorporating NFS-related settings"
             for r in NFS-* ISO-PREFIX ; do
-                cp -f $MINDI_TMP/$r $bigdir/tmp || Die "Cannot copy $r - did you run out of disk space?"
+                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
             done
@@ -936 +932 @@
     local res currline partition all_partitions ap_orig remaining i j
 
-    grep -vx " *#.*" $MY_FSTAB | grep -vx " *none.*" | $AWK '/^\/dev\/[imhs]d||LABEL\=\// && !/fdd|cdr|zip|floppy/ {print $1}'
+    grep -vx " *#.*" $MY_FSTAB | grep -vx " *none.*" | $AWK '/^\/dev\/[imhs]d||^LABEL\=\/|^UUID=/ && !/fdd|cdr|zip|floppy/ {print $1}'
     [ -e "/etc/raidtab" ] && $AWK '/^ *device/ {print $2}' /etc/raidtab
     return
@@ -986 +982 @@
     for fname in $incoming ; do
         if [ ! -e "$fname" ] ; then
-            echo "Warning - $fname does not exist; cannot be LDD'd." >> $LOGFILE
+            echo "WARNING - $fname does not exist; cannot be LDD'd." >> $LOGFILE
             if echo $fname | grep lvm &> /dev/null ; then
                 echo "This warning only affects you if you are using LVM." >> $LOGFILE
@@ -1065 +1061 @@
         /usr/bin/logger -s $1
     fi
-    echo -en "$1" >> $LOGFILE
+    echo -e "$1" >> $LOGFILE
 }
 
@@ -1179 +1175 @@
 absolute_partition old_partition_fmt current_lvolume
 
-    echo "Your raw fstab file looks like this:-" >> $LOGFILE
+    echo "Your raw fstab file looks like this:" >> $LOGFILE
+    echo "------------------------------------" >> $LOGFILE
     cat $MY_FSTAB >> $LOGFILE
-    echo "Your mountlist will look like this:-"
+    echo "Your mountlist will look like this:" | tee -a $LOGFILE
+    echo "-----------------------------------" >> $LOGFILE
 
 # scratchdir, mountlist(OUT)
@@ -1201 +1199 @@
     if [ $LVM != "false" ]; then
         echo -en "\rAnalyzing LVM...\r"
-        all_partitions=`$MINDI_LIB/analyze-my-lvm | grep -F ">>>" | cut -d' ' -f2-32`
+        $MINDI_LIB/analyze-my-lvm > $MINDI_TMP/lvm.res
+        if [ $? -ne 0 ]; then
+            LVM="false"
+        fi
+        all_partitions=`cat $MINDI_TMP/lvm.res | grep -F ">>>" | cut -d' ' -f2-32`
     fi
     all_partitions="$all_partitions `ListAllPartitions 2> /dev/null`"
@@ -1209 +1211 @@
     done
     [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`"
-    printf "        %-15s %-15s %-15s %-15s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL
+    printf "        %-15s %-15s %-15s %-15s %-15s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL UUID | tee -a $LOGFILE
     useless_dev="/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw /dev/scd /dev/ram :/ /dev/sr0 /dev/sr1 /dev/cdrom1"
     for c_p in $all_partitions ; do
@@ -1223 +1225 @@
         [ "$c_p" = "none" ] && continue
         redhat_label=""
+        uuid=""
         absolute_partition=`readlink -f $c_p`
         partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -w "$current_partition" | /bin/grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
@@ -1249 +1252 @@
                 # For LVM FS it will give a /dev/dm-# which should then be converted
                 if [ $LVM = "v2" ] && [ "`echo $actual_dev | grep '/dev/dm'`" ]; then
-                    major=`/bin/ls -l $actual_dev | awk '{print $5}'`
-                    minor=`/bin/ls -l $actual_dev | awk '{print $6}'`
+                    major=`/bin/ls -l $actual_dev | $AWK '{print $5}'`
+                    minor=`/bin/ls -l $actual_dev | $AWK '{print $6}'`
                     for dev in `ls /dev/mapper/*`; do
-                        major1=`/bin/ls -l $dev | awk '{print $5}'`
-                        minor1=`/bin/ls -l $dev | awk '{print $6}'`
+                        major1=`/bin/ls -l $dev | $AWK '{print $5}'`
+                        minor1=`/bin/ls -l $dev | $AWK '{print $6}'`
                         if [ $major1 = $major ] && [ $minor1 = $minor ]; then
-                            actual_dev=`/bin/ls -l $dev | awk '{print $10}'`
+                            actual_dev=`/bin/ls -l $dev | $AWK '{print $10}'`
                             break
                         fi
@@ -1271 +1274 @@
             # SWAP only
             if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then
-                list_swaps=`cat /proc/swaps | /bin/grep "/dev/" | /bin/awk '{ print $1 }' `
+                list_swaps=`cat /proc/swaps | /bin/grep "/dev/" | $AWK '{ print $1 }' `
                 for dev_swap in $list_swaps ; do
                     dev_exists=`/sbin/vol_id $dev_swap | /bin/grep "$redhat_label"`
@@ -1289 +1292 @@
                     do
                         # Location of the swap label for kernel 2.6
-                        try_dev_label=`dd bs=1 count=16 skip=1052 if=$try_dev 2> /dev/null`
+                        try_dev_label=`dd bs=1 count=16 skip=1052 if=$try_dev &> /dev/null`
                         if [ "x$try_dev_label" = "x$redhat_label" ]; then
                             actual_dev=$try_dev
@@ -1295 +1298 @@
                     done
             fi
+        fi
+
+        # This part tries to retrieve the correct device from a UUID line in /etc/fstab
+        # current_partition contains only first column of /etc/fstab
+        if [ "`echo "$current_partition" | /bin/grep -i "UUID="`" != "" ]; then
+            str_to_find_fmt_with=$current_partition
+            uuid=`echo "$current_partition" | /bin/cut -d'=' -f2`
+            actual_dev=""
+
+            # 1st try, findfs - the RHEL way of finding labels and their partitions
+            if [ -x "/sbin/findfs" ]; then
+                actual_dev=`/sbin/findfs UUID=${uuid} 2> /dev/null`
+            fi
+    
+            # 2nd try : blkid, the good way for all LABEL except swap
+            if [ "x$actual_dev" = "x" -a -x "/sbin/blkid" ]; then
+                actual_dev=`/sbin/blkid | /bin/grep "$uuid" | grep UUID= | /bin/cut -d':' -f1`
+                # For LVM FS it will give a /dev/dm-# which should then be converted
+                if [ $LVM = "v2" ] && [ "`echo $actual_dev | grep '/dev/dm'`" ]; then
+                    major=`/bin/ls -l $actual_dev | $AWK '{print $5}'`
+                    minor=`/bin/ls -l $actual_dev | $AWK '{print $6}'`
+                    for dev in `ls /dev/mapper/*`; do
+                        major1=`/bin/ls -l $dev | $AWK '{print $5}'`
+                        minor1=`/bin/ls -l $dev | $AWK '{print $6}'`
+                        if [ $major1 = $major ] && [ $minor1 = $minor ]; then
+                            actual_dev=`/bin/ls -l $dev | $AWK '{print $10}'`
+                            break
+                        fi
+                    done
+                fi
+            fi
+    
+            # 3th try, with vol_id 
+            if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then
+                list_dev=`mount | /bin/grep -E '^/' | $AWK '{ print $1 }' `
+                for dev in $list_dev ; do
+                    dev_exists=`/sbin/vol_id $dev | /bin/grep "$uuid"`
+                    if [ "x$dev_exists" != "x" ]; then
+                        actual_dev=$dev
+                        break;
+                    fi
+                done
+            fi
 
             # Check if one of all those tries has known success
@@ -1300 +1346 @@
                 current_partition=$actual_dev
             else
-                Die "Your system uses a labelled 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\n"
+                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"
             fi
         else
@@ -1374 +1420 @@
             partition_mountpt="image"
             old_partition_fmt=$partition_format
-#           partition_format="`$FDISK -l 2>> $LOGFILE | tr -s '\t' ' ' | grep -w "$absolute_partition" | $AWK 'x=$(NF-1}'`"
             partition_format="`$FDISK -l 2>> $LOGFILE | tr '*' ' ' | tr '+' ' ' | tr -s ' ' '\t' | grep -w "$absolute_partition" | cut -f5`"
-            echo "------- $FDISK -l log ------------" >> $LOGFILE
-            cat $FDISKLOG >> $LOGFILE
-            echo "------- $FDISK log end ------------" >> $LOGFILE
             partition_size=$(($partition_size+1)); # just in case
             if [ "$partition_format" = "Linux" ] ; then
@@ -1391 +1433 @@
         fi
         if [ ! "$partition_mountpt" ] ; then
+            echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
             for qq in "" `find /dev/ida/c*d* ! -name '*p*'` ; 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`
-                echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
-                cat $FDISKLOG >> $LOGFILE
-                echo "------- $FDISK log end ------------" >> $LOGFILE
                 [ "$partition_format" ] && break
             done
+            echo "------- $FDISK log end ------------" >> $LOGFILE
             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\n"
+                LogIt "Unable to find mountpoint of $current_partition - ignoring"
                 continue
             fi
         fi
         partition_format="`echo "$partition_format" | cut -d',' -f1`"; # in case user has ext3,ext2 or something dumb like that
-        [ "$partition_format" = "auto" ] && partition_format="`mount | grep -w $current_partition | awk '{print$5;}'`"; # in case user uses 'auto' (dumb!)
-        unofficial_outstring=`printf "\t%-15s %-15s %-15s %7s\n" $current_partition $partition_mountpt $partition_format $psz`
+        [ "$partition_format" = "auto" ] && partition_format="`mount | grep -w $current_partition | $AWK '{print$5;}'`"; # in case user uses 'auto' (dumb!)
+        unofficial_outstring=`printf "\t%-15s %-15s %-15s %7s %-15s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" $uuid`
         if [ "$current_partition" = "" ] ; then
             echo "Unknown partition (outstring = $unofficial_outstring)" >> $LOGFILE
@@ -1414 +1455 @@
                 partition_mountpt=raid
                 partition_format=raid
-                printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label"
-                printf "%s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" >> $mountlist
+                printf "\t%-15s %-15s %-15s %7s %-15s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" $uuid | tee -a $LOGFILE
+                printf "%s %s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" $uuid >> $mountlist
             else
                 echo "Unknown mountpoint (outstring = $unofficial_outstring)" >> $LOGFILE
@@ -1430 +1471 @@
                 partition_format="vfat"
             fi
-            printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label"
-            printf "%s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" >> $mountlist
+            printf "\t%-15s %-15s %-15s %7s %-15s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" $uuid | tee -a $LOGFILE
+            printf "%s %s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" $uuid >> $mountlist
         fi
     done
@@ -1491 +1532 @@
             old_pwd=`pwd`
             cd $minidir_root/$old_diskno
-            cp --parents -Rdf $filename $minidir_root/$d/ || Die "Can't move $filename (sensibly) from $old_diskno to $d"
+            cp --parents -Rdf $filename $minidir_root/$d/ 2>> $LOGFILE || Die "Can't move $filename (sensibly) from $old_diskno to $d"
             rm -f $filename
             cd $old_pwd
@@ -1510 +1551 @@
     data_dev=$3
 
-    echo -en "Would you like to create boot+data floppy disks now (y/n) ?"
+    echo -en "Would you like to create boot+data floppy disks now (y/[n]) ?"
     read i
     [ "$i" != "y" ] && [ "$i" != "Y" ] && return
@@ -1536 +1577 @@
     local i old_pwd
     if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ ! "`DidMondoCallMe`" ] ; then
-        echo -en "Shall I make a bootable CD image? (y/n) "
+        echo -en "Shall I make a bootable CD image? (y/[n]) "
         read i
         [ "$i" != "y" ] && [ "$i" != "Y" ] && return 0
     fi
     if [ ! "$MINDI_TMP" ] ; then
-        LogIt "NB: Mindi's bootable CD always uses isolinux.\n"
-        LogIt "For a bootable CD w/LILO, please use Mondo.\n"
+        LogIt "NB: Mindi's bootable CD always uses isolinux."
+        LogIt "For a bootable CD w/LILO, please use Mondo."
     fi
     rm -Rf $MINDI_TMP/iso
     mkdir -p $MINDI_TMP/iso/{images,archives,isolinux}
-    cp -f $1/*.img $1/*.gz $MINDI_TMP/iso/images || LogIt "OfferToMakeBootableISO: Cannot copy $i to $MINDI_TMP/iso/images\n"
+    cp -f $1/*.img $1/*.gz $MINDI_TMP/iso/images 2>> $LOGFILE || LogIt "OfferToMakeBootableISO: Cannot copy $i to $MINDI_TMP/iso/images"
     old_pwd=`pwd`
     cd $MINDI_TMP/iso
@@ -1555 +1596 @@
         k=$MINDI_TMP/iso/isolinux
         if [ -e "$j" ] ; then
-            LogIt "Copying $j to $k\n"
+            LogIt "Copying $j to $k"
             cp -f $j $k 2> /dev/null || Die "Failed to copy $j to $k"
             cp -f $j $MINDI_TMP 2> /dev/null || Die "Failed to copy $j to $MINDI_TMP"
@@ -1563 +1604 @@
     MakeSyslinuxMessageFile $MINDI_TMP/iso/isolinux/message.txt
     cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/isolinux/vmlinuz). Did you run out of disk space?"
-    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img
-    cp $MINDI_TMP/mindi.rdz $CACHE_LOC/initrd.img
+    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img 2>> $LOGFILE
+    cp $MINDI_TMP/mindi.rdz $CACHE_LOC/initrd.img 2>> $LOGFILE
     [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
     cd $MINDI_TMP/iso/isolinux
@@ -1574 +1615 @@
     if [ "$ARCH" != "ia64" ] ; then
         cp $ISOLINUX isolinux.bin 2> /dev/null || Die "Cannot copy isolinux.bin ($ISOLINUX) to tmp_root - did you run out of disk space?"
-        cp $ISOLINUX ../
+        cp $ISOLINUX ../ 2>> $LOGFILE
     fi
     cd $MINDI_TMP/iso
@@ -1580 +1621 @@
         cp -f $MINDI_TMP/iso/isolinux/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT 2> /dev/null || Die "Cannot copy core files to ramdisk for boot disk. Did you run out of disk space?"
     fi
-    [ "$MONDO_SHARE" ] && cp -f $MONDO_SHARE/autorun .   
+    [ "$MONDO_SHARE" ] && cp -f $MONDO_SHARE/autorun .    2>> $LOGFILE
     if [ "$ARCH" != "ia64" ] ; then
         mkisofs -U -J -r -o $CACHE_LOC/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
@@ -1591 +1632 @@
         echo "mkisofs returned the following errors:-"
         cat $MINDI_TMP/mkisofs.log
-        LogIt "Failed to create ISO image.\n"
+        LogIt "Failed to create ISO image."
     else
         echo "Created bootable ISO image at $CACHE_LOC/mindi.iso" >> $LOGFILE
@@ -1646 +1687 @@
     image=$MINDI_TMP/$rand1.$rand2.img
     mtpt=$MINDI_TMP/$rand1.$rand2.mtpt
-    dd if=/dev/zero of=$image bs=1k count=$disksize
-    mke2fs -N 26 -F $image > /dev/null
+    dd if=/dev/zero of=$image bs=1k count=$disksize &> /dev/null
+    mke2fs -N 26 -F $image &> /dev/null
     mkdir -p $mtpt
     mount -o loop $image $mtpt
     cd $mtpt
     mkdir -p {dev,tmp,boot}
-    cp -f $1 vmlinuz
+    cp -f $1 vmlinuz 2>> $LOGFILE
     if [ "$?" -ne "0" ] ; then
-        LogIt "Failed to copy $1 to ramdisk\n"
+        LogIt "Failed to copy $1 to ramdisk"
         cd $old_pwd
         umount $mtpt
@@ -1666 +1707 @@
     rdev -r vmlinuz 49152
 
-    tar -zxf $MINDI_LIB/dev.tgz || LogIt "Cannot untar dev.tgz\n"
+    tar -zxf $MINDI_LIB/dev.tgz || LogIt "Cannot untar dev.tgz"
     losetup /dev/loop0 > /dev/null 2> /dev/null
-    [ "$?" -eq "0" ] || losetup /dev/loop0 -d || Die "Please free up /dev/loop0 by typing 'losetup /dev/loop0 -d'.\nReboot if necessary.\n"
+    [ "$?" -eq "0" ] || losetup /dev/loop0 -d || Die "Please free up /dev/loop0 by typing 'losetup /dev/loop0 -d'.\nReboot if necessary."
     CopyBootBFile $mtpt/boot.b
 
@@ -1784 +1825 @@
     dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
     if [ "$ARCH" = "ia64" ] ; then
-        mkdosfs $imagefile > $MINDI_TMP/mke2fs.log 2>> $MINDI_TMP/mke2fs.log
-    t=vfat
-    else
-        mke2fs -N 26 -m 0 -F $imagefile > $MINDI_TMP/mke2fs.log 2>> $MINDI_TMP/mke2fs.log
-    t=ext2
-    fi
-    [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.log
-    rm -f $MINDI_TMP/mke2fs.log
-    mount -t $t -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)\n\n"
-# copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
+        mkdosfs $imagefile >> $LOGFILE 2>> $LOGFILE
+        t=vfat
+    else
+        mke2fs -N 26 -m 0 -F $imagefile >> $LOGFILE 2>> $LOGFILE
+        t=ext2
+    fi
+    mount -t $t -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)"
+    # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
     mkdir -p $mountpoint/etc
     if [ "$ARCH" != "ia64" ] ; then
@@ -1803 +1842 @@
     cd $mountpoint
     if [ "$ARCH" != "ia64" ] ; then
-        tar -zxf $MINDI_LIB/dev.tgz || LogIt "Cannot untar dev.tgz\n"
+        tar -zxf $MINDI_LIB/dev.tgz || LogIt "Cannot untar dev.tgz"
     fi
     cd $old_pwd
     losetup /dev/loop0 > /dev/null 2> /dev/null
-    [ "$?" -eq "0" ] || losetup /dev/loop0 -d || Die "Please free up /dev/loop0 by typing   'losetup /dev/loop0 -d'.\nReboot if necessary.\n"
+    [ "$?" -eq "0" ] || losetup /dev/loop0 -d || Die "Please free up /dev/loop0 by typing   'losetup /dev/loop0 -d'.\nReboot if necessary."
     CopyBootBFile $mountpoint/boot.b
 
@@ -1815 +1854 @@
     cp -f $MINDI_TMP/mindi.rdz $mountpoint 2>> $LOGFILE
     if [ "$?" -ne "0" ] ; then
-        LogIt "Failed to copy $MINDI_TMP/mindi.rdz to $mountpoint\n"
+        LogIt "Failed to copy $MINDI_TMP/mindi.rdz to $mountpoint"
         cat $MINDI_TMP/mtpt.$$ >> $LOGFILE
-        LogIt "Please unload some of your modules and try again.\n"
+        LogIt "Please unload some of your modules and try again."
         rm -f $MINDI_TMP/mtpt.$$
-        LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)\n"
+        LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)"
         retval=$(($retval+1))
     fi
@@ -1846 +1885 @@
         cd $old_pwd
         umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
-        rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)\n"
+        rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
     #   losetup /dev/loop0 -d
         res=0
         write_full_floppy_of_kernel $kernelpath $imagesdir/mindi-boot.1440.img 1440
         res=$(($res+$?))
-        cp -f $MINDI_TMP/mindi.rdz $imagesdir/mindi-root.1440.img
+        cp -f $MINDI_TMP/mindi.rdz $imagesdir/mindi-root.1440.img 2>> $LOGFILE
         res=$(($res+$?))
         rm -f $imagefile
         if [ "$res" -ne "0" ]; then
-            LogIt "Warning - failed to create 1.44MB boot/root floppies\n"
+            LogIt "WARNING - failed to create 1.44MB boot/root floppies"
             rm -f $imagesdir/mindi-*.1440.img
         fi
@@ -1866 +1905 @@
 # make it bootable
     rm -f $mountpoint/zero
-    [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint
+    [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint 2>> $LOGFILE
     if [ "$disksize" -gt "2880" ] && [ ! "$KERN_DISK_MADE" ] ; then
         if [ "$ARCH" != "ia64" ] ; then
@@ -1883 +1922 @@
     if [ $? -ne "0" ] ; then
         if [ "`grep -F "/tmp/dev.0" $LOGFILE`" ] ; then
-            LogIt "The '/tmp/dev.0' error is NOT Mindi's fault. It is LILO's.\n"
-            LogIt "Please reboot your PC as a workaround.\n"
-            Die "LILO sneezed and Mindi caught a cold. Please read the README / FAQ.\n"
+            LogIt "The '/tmp/dev.0' error is NOT Mindi's fault. It is LILO's."
+            LogIt "Please reboot your PC as a workaround."
+            Die "LILO sneezed and Mindi caught a cold. Please read the README / FAQ."
         fi
         echo "$LILO_EXE -r $mountpoint ...failed."
         echo -en "Press ENTER to continue."; read line
-        LogIt "Cannot run lilo on $mountpoint\nPlease upgrade/downgrade your version of LILO. It has a bug.\n"
+        LogIt "Cannot run lilo on $mountpoint\nPlease upgrade/downgrade your version of LILO. It has a bug."
         retval=$(($retval+1))
     fi
-    cp -f $liloconf $MINDI_TMP/lilo.conf
+    cp -f $liloconf $MINDI_TMP/lilo.conf 2>> $LOGFILE
     if [ "$ARCH" = "ia64" ] ; then
-        cp `dirname $kernelpath`/*.efi $mountpoint
+        cp `dirname $kernelpath`/*.efi $mountpoint 2>> $LOGFILE
     fi
     umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
     echo -en "..."
-    rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)\n"
+    rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
     if [ "$retval" -eq "0" ] ; then
         echo -en "...$DONE\r"
@@ -1909 +1948 @@
         rm -f $imagefile
     fi
-    [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero\n"
+    [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero"
     return $retval
 }
@@ -1942 +1981 @@
     else
         dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
-        mkfs.vfat $imagefile
-        syslinux $imagefile
-    fi
-    mount -t vfat -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)\n\n"
+        mkfs.vfat $imagefile >> $LOGFILE 2>> $LOGFILE
+        syslinux $imagefile >> $LOGFILE 2>> $LOGFILE
+    fi
+    mount -t vfat -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)"
 
     # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
@@ -1961 +2000 @@
     cp -f $MINDI_TMP/mindi.rdz $mountpoint/initrd.img 2>> $LOGFILE
     if [ "$?" -ne "0" ] ; then
-        LogIt "Failed to copy $MINDI_TMP/mindi.rdz to $mountpoint\n"
+        LogIt "Failed to copy $MINDI_TMP/mindi.rdz to $mountpoint"
         cat $MINDI_TMP/mtpt.$$ >> $LOGFILE
-        LogIt "Please unload some of your modules and try again.\n"
+        LogIt "Please unload some of your modules and try again."
         rm -f $MINDI_TMP/mtpt.$$
-        LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)\n"
+        LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)"
         retval=$(($retval+1))
     fi
@@ -1986 +2025 @@
         cd $old_pwd
         umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
-        rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)\n"
+        rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
 
         res=0
         write_full_floppy_of_kernel $kernelpath $imagesdir/mindi-boot.1440.img 1440
         res=$(($res+$?))
-        cp -f $MINDI_TMP/mindi.rdz $imagesdir/mindi-root.1440.img
+        cp -f $MINDI_TMP/mindi.rdz $imagesdir/mindi-root.1440.img 2>> $LOGFILE
         res=$(($res+$?))
         rm -f $imagefile
         if [ "$res" -ne "0" ]; then
-            LogIt "Warning - failed to create 1.44MB boot/root floppies\n"
+            LogIt "WARNING - failed to create 1.44MB boot/root floppies"
             rm -f $imagesdir/mindi-*.1440.img
         fi
@@ -2008 +2047 @@
     rm -f $mountpoint/zero
     mkdir -p $mountpoint/etc
-    [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint
+    [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint 2>> $LOGFILE
     umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
     echo -en "..."
-    rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)\n"
+    rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
 
     if [ "$retval" -eq "0" ] ; then
@@ -2024 +2063 @@
         rm -f $imagefile
     fi
-    [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero\n"
+    [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero"
     return $retval
 }
@@ -2048 +2087 @@
         cd $MINDI_TMP
         for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
-            cp --parents -pRdf ./$i $bigdir || Die "PDDI can't cp $i->$bigdir"
+            cp --parents -pRdf ./$i $bigdir 2>> $LOGFILE || Die "PDDI can't cp $i->$bigdir"
             if [ "`du -sk $i | cut -f1`" -lt "$(($CHOPSIZE*2))" ] ; then
-                cp --parents -pRdf $i $bigdir
+                cp --parents -pRdf $i $bigdir 2>> $LOGFILE
             else
                 ChopUpAndCopyFile $i $bigdir $CHOPSIZE $BIGNO
@@ -2058 +2097 @@
         for i in $EXTRA_MODS ; do
             j=`find lib/modules/$FAILSAFE_KVER -name $i.*o 2> /dev/null`
-            [ ! "$j" ] && echo "Warning - cannot find failsafe module $i.o" >> $LOGFILE
+            [ ! "$j" ] && echo "WARNING - cannot find failsafe module $i.o" >> $LOGFILE
             for k in $j ; do
                 if [ "`du -sk $k | cut -f1`" -lt "$CHOPSIZE" ] ; then
-                    cp --parents -pRdf $k $bigdir
+                    cp --parents -pRdf $k $bigdir 2>> $LOGFILE
                 else
                     ChopUpAndCopyFile $k $bigdir $CHOPSIZE $BIGNO
@@ -2090 +2129 @@
     for i in `mount | cut -d' ' -f3` ; do
         for j in io.sys msdos.sys ; do
-            [ -e "$i/$j" ] && cp -f $i/$j $bigdir
+            [ -e "$i/$j" ] && cp -f $i/$j $bigdir 2>> $LOGFILE
         done
     done
@@ -2097 +2136 @@
     i=`cat $MINDI_TMP/BOOTLOADER.DEVICE 2> /dev/null`
     if [ "$i" ] ; then
-        LogIt "Backing up $i's MBR\n"
+        LogIt "Backing up $i's MBR"
         dd if=$i of=$bigdir/BOOTLOADER.MBR bs=446 count=1 >> $LOGFILE 2>> $LOGFILE
         sleep 1
@@ -2103 +2142 @@
         j=$i
         [ -h "$j" ] && j=`readlink -f $j`
-        LogIt "Creating /dev/boot_device ($j)\n"
+        LogIt "Creating /dev/boot_device ($j)"
         mkdir -p $bigdir/dev
         cp -pRdf $j $bigdir/dev/boot_device 2> /dev/null || Die "Unable to create /dev/boot_device on ramdisk"
@@ -2112 +2151 @@
 
     [ -e "$MINDI_LIB/aux-tools" ] || Die "aux-tools not found in Mindi's home dir. Do you have multiple copies of Mindi lying around? Please delete them. No, don't e-mail me and ask how. ;) Use 'rm'."
-    cp -Rdf $MINDI_LIB/aux-tools/* . 2>> $LOGFILE || LogIt "Warning - error occurred while unzipping aux-tools\n"
+    cp -Rdf $MINDI_LIB/aux-tools/* . 2>> $LOGFILE || LogIt "WARNING - error occurred while unzipping aux-tools"
     if [ -e "$MINDI_LIB/x11-tools.tgz" ] ; then
-        tar -zxf $MINDI_LIB/x11-tools.tgz 2>> $LOGFILE || LogIt "Warning - error occurred while unzipping x11-tools.tgz\n"
+        tar -zxf $MINDI_LIB/x11-tools.tgz 2>> $LOGFILE || LogIt "WARNING - error occurred while unzipping x11-tools.tgz"
     fi
     if [ -e "$MONDO_SHARE/restore-scripts" ] ; then
@@ -2120 +2159 @@
         [ "$?" -ne "0" ] && [ "`DidMondoCallMe`" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
     fi
-    [ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state .
+    [ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state . 2>> $LOGFILE
     cd $old_pwd
     echo -e "$DONE"
@@ -2135 +2174 @@
     mkdir -p $minidir_root/$noof_disks/tmp
     cp -f $MINDI_TMP/mountlist.txt $minidir_root/$noof_disks/tmp/mountlist.txt 2> /dev/null || Die "Cannot copy mountlist.txt from $MINDI_TMP to data disk"
-    [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/.
-    [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
+    [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
+    [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm || LVM="false"
     cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
     ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
@@ -2214 +2253 @@
         return 1
     fi
-    lines_total=`wc -l $orig_file | gawk '{print $1;}'`
+    lines_total=`wc -l $orig_file | $AWK '{print $1;}'`
     lines_remaining=$(($lines_total-$lino))
     head -n$(($lino-1)) $orig_file > $new_file
@@ -2246 +2285 @@
     fi
     # patch from Bill <bill@iwizard.biz> - 2003/08/25
-    res=`$FDISK -s $device`
-    echo "------- $FDISK -l $device log ------------" >> $LOGFILE
-    cat $FDISKLOG >> $LOGFILE
-    echo "------- $FDISK log end ------------" >> $LOGFILE
+    res=`$FDISK -s $device 2>> $LOGFILE`
     # end patch
     [ "$res" = "" ] && res=`df -k -P -x supermount | tr -s '\t' ' ' | grep -F "$device " | cut -d' ' -f2`
@@ -2284 +2320 @@
 
     tempfile=$MINDI_TMP/$$.strip.txt
-    cp -f $1 $tempfile
+    cp -f $1 $tempfile 2>> $LOGFILE
     $AWK '{if (substr($0,0,1)!="#" || substr($0,0,3)=="#!/") {print $0;};}' $tempfile > $1
     rm -f $tempfile
@@ -2316 +2352 @@
     tmpfile=$MINDI_TMP/stripped.$$.dat
     [ -d "$1" ] || [ -h "$1" ] && return
-    cp -f $1 $tmpfile
+    cp -f $1 $tmpfile 2>> $LOGFILE
     strip $tmpfile 2> /dev/null
     if [ "$?" -eq "0" ] ; then
-        cp -f $tmpfile $1
+        cp -f $tmpfile $1 2>> $LOGFILE
         echo "Stripped binary $2" >> $LOGFILE
     fi
@@ -2376 +2412 @@
             # 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...\n"
+                LogIt "Have you recompiled your kernel \"$fname\" w/o rebooting? Naughty but I'll allow it..."
                 duff_kernels="$fname $duff_kernels"
             else
@@ -2384 +2420 @@
         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...\n"
+                LogIt "Have you recompiled your kernel \"$fname\" w/o rebooting?\n Naughty but I'll allow it..."
                 duff_kernels="$fname $duff_kernels"
             else
@@ -2396 +2432 @@
     fi
     if [ ! "$possible_kernels" ] ; then
-        LogIt "No kernel matches exactly. Are there any duff kernels?\n"
+        LogIt "No kernel matches exactly. Are there any duff kernels?"
         possible_kernels="$duff_kernels"
         if [ ! "$possible_kernels" ] ; then
-            LogIt "Sorry, no duff kernels either\n"
+            LogIt "Sorry, no duff kernels either"
         else
-            LogIt "I bet you're running Debian or Gentoo, aren't you?\n"
-            LogIt "Your kernel doesn't have a sane builddate. Oh well...\n"
+            LogIt "I bet you're running Debian or Gentoo, aren't you?"
+            LogIt "Your kernel doesn't have a sane builddate. Oh well..."
         fi
     fi
@@ -2408 +2444 @@
     noof_kernels=`CountItemsIn "$possible_kernels"`
     if [ "$noof_kernels" -eq "0" ] ; then
-        LogIt "Could not find your kernel.\n"
+        LogIt "Could not find your kernel."
         if [ -e "/boot/vmlinuz" ] ; then
-            LogIt "Using /boot/vmlinuz as a last resort.\n"
+            LogIt "Using /boot/vmlinuz as a last resort."
             output=/boot/vmlinuz
         else
@@ -2423 +2459 @@
             if echo $i | grep "`uname -r`" ; then
                 LogIt "OK, I used my initiative and found that "
-                LogIt "$i is probably your kernel.\n "
+                LogIt "$i is probably your kernel. "
                 output="$i"
                 return
@@ -2432 +2468 @@
             echo "Schlomo, this one's for you." >> $LOGFILE
         else
-            LogIt "Two or more possible kernels found. You may specify any one of them and the \n"
-            LogIt "boot disks will still work, probably. If one does not work, try another.\n"
-            LogIt "$possible_kernels\n"
+            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"
             echo ""
         fi
@@ -2464 +2500 @@
     if [ -e "dev" ] ; then
         echo "Copying dev/* to $minidir_root/$noof_disks" >> $LOGFILE
-        cp --parents -pRdf dev $minidir_root/$noof_disks
+        cp --parents -pRdf dev $minidir_root/$noof_disks 2>> $LOGFILE
     fi
     TemporarilyCompressAllFiles "$list_of_files" $minidir_root
@@ -2475 +2511 @@
         fi
         if [ "$i" -eq "0" ] ; then
-            LogIt "Cannot add file $filename to minidir $minidir_root\n"
+            LogIt "Cannot add file $filename to minidir $minidir_root"
             retval=$(($retval+1))
         fi
@@ -2509 +2545 @@
     echo -en "..."
     mke2fs -b 1024 -m 1 -i 2048 -F $tempfile >> $LOGFILE 2>> $LOGFILE
-
-    [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.log
-    rm -f $MINDI_TMP/mke2fs.log
     echo -en "..."
     mkdir -p $mountpoint
@@ -2518 +2551 @@
     old_pwd=`pwd`
     cd $mountpoint
-    cp -Rdf $tgz_dir_fname/* . &>> $LOGFILE
+    cp -Rdf $tgz_dir_fname/* . 2>&1 >> $LOGFILE
     tar -zxf symlinks.tgz || Die "Cannot untar symlinks.tgz"
     cd dev || Die "Can't cd to dev"
@@ -2528 +2561 @@
         s=`which $w 2> /dev/null`
         if [ -e "$s" ] ; then
-            cp --parents -af $s .
+            cp --parents -af $s . 2>> $LOGFILE
         fi
     done
@@ -2581 +2614 @@
         list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"
     fi
-    [ -e "$floppy_modules_path" ] || LogIt "path $floppy_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS.\n"
+    [ -e "$floppy_modules_path" ] || LogIt "path $floppy_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
         floppy_modules="$floppy_modules `FindSpecificModuleInPath $floppy_modules_path $i`"
@@ -2589 +2622 @@
         [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
         echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
-        cp -df $i $mountpoint/ 2>/dev/null || LogIt "Unable to copy $i to $mountpoint\n"
+        cp -df $i $mountpoint/ 2>/dev/null || LogIt "Unable to copy $i to $mountpoint"
         [ "`echo "$i" | grep -F ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
     done
@@ -2651 +2684 @@
     diskno=1
     while [ "$diskno" -le "$noof_disks" ] ; do
-        cd $minidir_root/$diskno || LogIt "Warning - cannot cd to $minidir_root/$diskno\n"
+        cd $minidir_root/$diskno || LogIt "WARNING - cannot cd to $minidir_root/$diskno"
         tar -cf - . 2>> $LOGFILE | gzip -9 > $tardir/$diskno.tar.gz || Die "Can't tar/gzip disk#$diskno; please tell Dev Team -exactly- what the errors where."
         diskno=$(($diskno+1))
         echo -n "..."
-        cp -pRdf * $minidir_root/all
+        cp -pRdf * $minidir_root/all 2>> $LOGFILE
     done
     mkdir -p $minidir_root/all/tmp
@@ -2663 +2696 @@
         for q in filelist.full.gz biggielist.txt ; do
             [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q"
-            cp -pRdf $MINDI_TMP/$q tmp/
+            cp -pRdf $MINDI_TMP/$q tmp/ 2>> $LOGFILE
         done
         mkdir -p $minidir_root/all/tmp
@@ -2699 +2732 @@
 
 if [ -e "/etc/conf.modules" ] && [ ! -e "/etc/modules.conf" ] ; then
-    LogIt "Warning - Ancient distro detected.\n" 1
+    LogIt "WARNING - Ancient distro detected." 1
     ln -sf /etc/conf.modules /etc/modules.conf
 fi
@@ -2794 +2827 @@
         MINDI_TMP=$MONDO_TMP
         mkdir -p $MINDI_TMP
-        FDISKLOG=$MINDI_TMP/parted2fdisk.log
         CACHE_LOC=$3
         if [ _"$CACHE_LOC" != _"" ]; then
@@ -2806 +2838 @@
 ###
         kernelname=`echo $kernelpath | cut -d'-' -f2-`
-        LogIt "kernelname = $kernelname\n"
-        LogIt "kernelpath = $kernelpath\n"
+        LogIt "kernelname = $kernelname"
+        LogIt "kernelpath = $kernelpath"
         if [ ! -d "/lib/modules/$kernelname" ] && [ "$kernelpath" != "FAILSAFE" ]
         then
-           LogIt "Module path for ${kernelpath} not found...\n"
-           LogIt "using running kernel\'s modules.\n"
+           LogIt "Module path for ${kernelpath} not found..."
+           LogIt "using running kernel\'s modules."
            kernelname=`uname -r`
         else
-           LogIt "Using modules for kernel: ${kernelname}\n"
+           LogIt "Using modules for kernel: ${kernelname}"
         fi
 ###
@@ -2844 +2876 @@
         [ "$USE_COMP" = "" ] && USE_COMP=yes
         [ "$NOT_BOOT" = "" ] && NOT_BOOT=no
-        [ "$TAPEDEV" ] && LogIt "This is a tape-based backup. Fine.\n"
+        [ "$TAPEDEV" ] && LogIt "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...\n"
-           LogIt "using running kernel\'s modules.\n"
+           LogIt "Module path for ${kernelpath} not found..."
+           LogIt "using running kernel\'s modules."
            kernelname=`uname -r`
         else
-           LogIt "Using modules for kernel: ${kernelname}\n"
+           LogIt "Using modules for kernel: ${kernelname}"
         fi
         [ "$CDRECOVERY" = "yes" ] && [ "$TAPEDEV" != "" ] && Die "Sorry, you can't use --cd-recovery and --write-tapes at the same time"
@@ -2877 +2909 @@
 fi
 
-
 [ -e "$iso_cfg_file" ] || Die "Cannot find $iso_cfg_file"
 if [ ! "`DidMondoCallMe`" ] ; then
-    LogIt "Mindi Linux mini-distro generator v$MINDI_VERSION\n"
-    LogIt "Latest Mindi is available from http://www.mondorescue.org\n"
-    LogIt "BusyBox sources are available from http://www.busybox.net\n"
+    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 "------------------------------------------------------------------------------"
 else
@@ -2900 +2931 @@
 echo "NOT_BOOT = '$NOT_BOOT'" >> $LOGFILE
 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.\n"
+    LogIt "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
@@ -2908 +2939 @@
     tar -cv tmp | gzip -9 > $MINDI_TMP/all.tar.gz || Die "Cannot make small all.tar.gz"
     sleep 2
-    LogIt "Done. Exiting.\n"
+    LogIt "Done. Exiting."
     MindiExit 0
 fi
@@ -2914 +2945 @@
 if [ "$kernelpath" = "" ] ; then
     [ "`DidMondoCallMe`" ] && Die "Please use -k <path> to specify kernel."
-    if [ $USE_OWN_KERNEL != "yes" ]; then
-        echo -en "Do you want to use your own kernel to build the boot disk (y/n) ?"
-        read ch
-        if [ "$ch" != "n" ] && [ "$ch" != "N" ] ; then
-            USE_OWN_KERNEL="yes"
-        fi
+    echo -en "Do you want to use your own kernel to build the boot disk ([y]/n) ?"
+    read ch
+    if [ "$ch" != "n" ] && [ "$ch" != "N" ] ; then
+        USE_OWN_KERNEL="yes"
     fi
     if [ "$USE_OWN_KERNEL" = "yes" ]; then
@@ -2933 +2962 @@
 fi
 if [ ! "`DidMondoCallMe`" ] ; then
-    echo -en "Would you like to use LILO (instead of syslinux)\nfor your boot CD/floppies (y/n) ?"
+    echo -en "Would you like to use LILO (instead of syslinux)\nfor your boot CD/floppies (y/[n]) ?"
     read ch
-    if [ "$ch" != "n" ] && [ "$ch" != "N" ] ; then
+    if [ "$ch" != "y" ] && [ "$ch" != "Y" ] ; then
+        USE_LILO=no
+    else
         USE_LILO=yes
-    else
-        USE_LILO=no
     fi
 fi
 if [ "$YOUR_KERNEL_SUCKS" != "" ] || [ "$kernelpath" = "" ] || [ "$kernelpath" = "SUCKS" ] || [ "$kernelpath" = "FAILSAFE" ] ; then
     kernelpath=$MINDI_LIB/vmlinuz
-    LogIt "I shall include Mindi's failsafe kernel, not your kernel, in the boot disks.\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"
+    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."
     pwd=`pwd`
     cd $MINDI_TMP
@@ -2953 +2982 @@
 fi
 echo -e "Mindi's temp dir = $MINDI_TMP \nMindi's output dir=$CACHE_LOC" >> $LOGFILE
-[ "$(($RANDOM%64))" -eq "0" ] && LogIt "Dude, I've looked inside your computer and it's really dusty...\n"
-
-[ "$YOUR_KERNEL_SUCKS" ] && [ ! "$FAILSAFE_KVER" ] && Die "Please install mindi-kernel package. You need it. Go to http://www.mondorescue.org and download it, then install it."
+[ "$(($RANDOM%64))" -eq "0" ] && LogIt "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."
 
 rm -f $CACHE_LOC/{*img,*gz,*iso}
@@ -2988 +3017 @@
     else
         if ! PrepareBootDiskImage_LILO $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
-            LogIt "Warning - failed to create 1.72MB boot image. Please reduce your kernel's size\n"
-            LogIt "if you want to make a 1.72MB floppy disk.\n"
+            LogIt "WARNING - failed to create 1.72MB boot image."
+            LogIt "Please reduce your kernel's size if you want to make a 1.72MB floppy disk."
         fi
         if ! PrepareBootDiskImage_LILO $CACHE_LOC 2880 $kernelpath $ramdisk_size ;  then
-            LogIt "Warning - failed to create 2.88MB floppy disk image.\n"
-            LogIt "Please reduce your kernel's size\n"
-            LogIt "if you want to make a 2.88MB floppy disk.\n"
+            LogIt "WARNING - failed to create 2.88MB floppy disk image."
+            LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
             PrepareBootDiskImage_LILO $CACHE_LOC 5760 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
         fi
@@ -3000 +3028 @@
 else
     if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
-        LogIt "Warning - failed to create 1.72MB boot image. Please reduce your kernel's size\n"
-        LogIt "if you want to make a 1.72MB floppy disk.\n"
+        LogIt "WARNING - failed to create 1.72MB boot image."
+        LogIt "Please reduce your kernel's size if you want to make a 1.72MB floppy disk."
         if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 2880 $kernelpath $ramdisk_size ; then
-            LogIt "Warning - failed to create 2.88MB floppy disk image.\n"
-            LogIt "Please reduce your kernel's size\n"
-            LogIt "if you want to make a 2.88MB floppy disk.\n"
+            LogIt "WARNING - failed to create 2.88MB floppy disk image."
+            LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
             PrepareBootDiskImage_SYSLINUX $CACHE_LOC 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
         fi
@@ -3024 +3051 @@
     fi
     OfferToMakeBootableISO $CACHE_LOC
-    LogIt "Finished.\n"
+    LogIt "Finished."
 elif [ "$TAPEDEV" ] ; then
     rm -f $CACHE_LOC/{*img,*gz,*iso}
     OfferToMakeBootableISO $CACHE_LOC
     if [ -e "$CACHE_LOC/all.tar.gz" ] ; then
-        cp -f $CACHE_LOC/all.tar.gz $MINDI_TMP/
+        cp -f $CACHE_LOC/all.tar.gz $MINDI_TMP/ 2>> $LOGFILE
     else
         Die "Cannot find all.tar.gz, to be written to tape"
@@ -3037 +3064 @@
 fi
 # cleanup
-LogIt "$FRIENDLY_OUTSTRING\n"
+LogIt "$FRIENDLY_OUTSTRING"
 for mtpt in $FLOPPY_WAS_MOUNTED ; do
     mount $mtpt

trunk/mondo-doc/mindi.8

@@ -138 +138 @@
 List of files to be included on boot/root disks.
 .TP
-.I /root/images/mindi/N.tar.gz
+.I /var/cache/mindi/N.tar.gz
 Number N of multiple tar balls together containing root file system for rescue
 media.
 .TP
-.I /root/images/mindi/all.tar.gz
+.I /var/cache/mindi/all.tar.gz
 Single tar ball of root file system for rescue media.
 .TP
-.I /root/images/mindi/initrd.img
+.I /var/cache/mindi/initrd.img
 initrd image for bootable ISO image.
 .TP
-.I /root/images/mindi/mindi-boot.F.img
+.I /var/cache/mindi/mindi-boot.F.img
 .B mindi
 boot floppy of size F [KB].
 .TP
-.I /root/images/mindi/mindi-root.F.img
+.I /var/cache/mindi/mindi-root.F.img
 .B mindi
 root floppy of size F [KB].
 .TP
-.I /root/images/mindi/mindi-data.N.img
+.I /var/cache/mindi/mindi-data.N.img
 .B mindi
 data floppy number N for boot/root floppies.
 .TP
-.I /root/images/mindi/mindi.iso
+.I /var/cache/mindi/mindi.iso
 .B mindi
 bootable ISO image.
+.SH CONFIGURATION FILE
+You may create a mindi configuration file under 
+.B /etc/mindi 
+called 
+.B mindi.conf 
+which overwrites default values by setting up the following variables:
+.TP 
+.I TMPDIR
+.B (default /tmp): directory to create temporary files
+.br
+.TP
+.I EXTRA_SPACE
+.B (default 24576): increase if you run out of ramdisk space
+.br
+.TP
+.I IA64_BOOT_SIZE
+.B (default 8192): size of the ia64 boot disk
+.br
+.TP
+.I CACHE_LOC
+.B (default /var/cache/mindi): directory where boot/root files 
+and iso are generated
+.br
+WARNING: This directory is erased before usage
+.br
 .SH "SEE ALSO"
 mondoarchive(8), mondorestore(8).
 .TP
 See mailing list at http://www.mondorescue.org for technical support.
-.SH BUGS
-The target location for the image files created by
-.B mindi
-is hard-coded to
-.IR "/root/images/mindi".
-As a workaround, it is suggested to make
-.I /root/images
-a symbolic link to the desired location for the image files.
 .SH AUTHORS
 Bruno Cornec (lead-development) 

trunk/mondo-doc/mondorescue-howto.sgml

@@ -1178 +1178 @@
 1440+0 enregistrements écrits.
 mke2fs 1.38 (30-Jun-2005)
-cp: écriture de `vmlinuz': Aucun espace disponible sur le périphérique
 Failed to copy /boot/vmlinuz-2.6.12-15mdk-i686-up-4GB to ramdisk
 

trunk/mondo/src/common/libmondo-devices.c

@@ -1462 +1462 @@
     bkpinfo->use_lzo =
         (bkpinfo->backup_media_type == cdstream) ? TRUE : FALSE;
-
-/*
-  if (find_home_of_exe("star") && (!find_home_of_exe("afio") || find_home_of_exe("selinuxenabled")))
-    {
-      bkpinfo->use_star = FALSE;    
-      bkpinfo->use_lzo = FALSE;
-      log_to_screen("Using star, not afio");
-      if (!find_home_of_exe("afio"))
-    { log_to_screen("...because afio not found"); }
-      if (find_home_of_exe("selinuxenabled"))
-    { log_to_screen("...because SELINUX found"); }
-    }
-*/
-
     mvaddstr_and_log_it(2, 0, " ");
 

trunk/mondo/src/common/libmondo-stream.c

@@ -346 +346 @@
     int res = 0;
     int retval = 0;
-    char *fname = (char *)&res;         /* Should NOT be NULL */
+    char *fname = (char *)&res;                 /* Should NOT be NULL */
 
 // xattr