Changeset 965 in MondoRescue for branches

Timestamp:

Nov 23, 2006, 5:22:18 PM (18 years ago)

Author:

Bruno Cornec

Message:

mindi log file should now look nicer

File:

• branches/stable/mindi/mindi (modified) (8 diffs)

branches/stable/mindi/mindi

@@ -1049 +1049 @@
         /usr/bin/logger -s $1
     fi
-    echo -en "$1" >> $LOGFILE
+    echo -e "$1" >> $LOGFILE
 }
 
@@ -1165 +1165 @@
     echo "Your raw fstab file looks like this:-" >> $LOGFILE
     cat $MY_FSTAB >> $LOGFILE
-    echo "Your mountlist will look like this:-"
+    echo "Your mountlist will look like this:-" | tee -a $LOGFILE
 
 # scratchdir, mountlist(OUT)
@@ -1196 +1196 @@
     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\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL | 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
@@ -1405 +1405 @@
             partition_mountpt="image"
             old_partition_fmt=$partition_format
-            echo "------- $FDISK -l log ------------" >> $LOGFILE
             partition_format="`$FDISK -l 2>> $LOGFILE | tr '*' ' ' | tr '+' ' ' | tr -s ' ' '\t' | grep -w "$absolute_partition" | cut -f5`"
-            echo "------- $FDISK log end ------------" >> $LOGFILE
             partition_size=$(($partition_size+1)); # just in case
             if [ "$partition_format" = "Linux" ] ; then
@@ -1420 +1418 @@
         fi
         if [ ! "$partition_mountpt" ] ; then
+            echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
             for qq in "" `find /dev/ida/c*d* ! -name '*p*'` ; do
-                echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
                 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 log end ------------" >> $LOGFILE
                 [ "$partition_format" ] && break
             done
+            echo "------- $FDISK log end ------------" >> $LOGFILE
             if [ "$partition_format" = "Compaq diagnostics" ] ; then
                 partition_format="compaq"
@@ -1442 +1440 @@
                 partition_mountpt=raid
                 partition_format=raid
-                printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label"
+                printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" | tee -a $LOGFILE
                 printf "%s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" >> $mountlist
             else
@@ -1458 +1456 @@
                 partition_format="vfat"
             fi
-            printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label"
+            printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" | tee -a $LOGFILE
             printf "%s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" >> $mountlist
         fi
@@ -2968 +2966 @@
 [ "$(($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. Go to http://www.mondorescue.org and download it, then install it."
+[ "$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 /root/images/mindi/{*img,*gz,*iso}