Changeset 960 in MondoRescue

Timestamp:

Nov 23, 2006, 11:19:43 AM (17 years ago)

Author:

Bruno Cornec

Message:

Removal of FDISKLOG

File:

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

branches/stable/mindi/mindi

@@ -1404 +1404 @@
             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}'`"
+            echo "------- $FDISK -l log ------------" >> $LOGFILE
             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
@@ -1422 +1420 @@
         if [ ! "$partition_mountpt" ] ; then
             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 -l $qq log ------------" >> $LOGFILE
-                cat $FDISKLOG >> $LOGFILE
                 echo "------- $FDISK log end ------------" >> $LOGFILE
                 [ "$partition_format" ] && break
@@ -2277 +2274 @@
     fi
     # patch from Bill <bill@iwizard.biz> - 2003/08/25
-    res=`$FDISK -s $device`
     echo "------- $FDISK -l $device log ------------" >> $LOGFILE
-    cat $FDISKLOG >> $LOGFILE
+    res=`$FDISK -s $device 2>> $LOGFILE`
     echo "------- $FDISK log end ------------" >> $LOGFILE
     # end patch
@@ -2899 +2895 @@
 fi
 
-FDISKLOG=$MINDI_TMP/parted2fdisk.log
-
 [ -e "$iso_cfg_file" ] || Die "Cannot find $iso_cfg_file"
 if [ ! "`DidMondoCallMe`" ] ; then