Changeset 2451 in MondoRescue for branches/2.2.10/mindi

Timestamp:

Oct 6, 2009, 1:34:09 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Fix a mr_asprintf usage without & causing a seg fault.
• Adds support for grub2 conf file grub.cfg in addition to menu.lst
• Fix for #288: only take the first result in SizeOfPartition in case of multiple mounts
• Improve USB log in case of error by adding the conf file

(Backport from 2.2.9)

File:

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

branches/2.2.10/mindi/mindi

@@ -1488 +1488 @@
             LogAll "----------- syslinux's errors --------------" |tee -a $LOGFILE
             cat $MINDI_TMP/syslinux.log |tee -a $LOGFILE
+            echo "----------- syslinux's conf --------------" |tee -a $LOGFILE
+            cat $MINDI_TMP/usb/syslinux.cfg |tee -a $LOGFILE
             LogAll "Failed to create USB image."
         else
@@ -1695 +1697 @@
         return 0
     fi
-    free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     max_kernel_size=$(($free_space+`du -sk $kernelpath | cut -f1`))
     LogFile "Free space left on image = $free_space KB" 
@@ -1790 +1791 @@
         return 0
     fi
-    free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     max_kernel_size=$(($free_space+`du -sk $kernelpath | cut -f1`))
     LogFile "Free space left on image = $free_space KB" 
@@ -2035 +2035 @@
     res=`$FDISK -s $device 2>> $LOGFILE`
     # end patch
-    [ "$res" = "" ] && res=`df -k -P -x supermount | tr -s '\t' ' ' | grep -F "$device " | cut -d' ' -f2`
+    # take only the first in case of multiple mount (cifs, nfs, ...)
+    [ "$res" = "" ] && res=`df -k -P -x supermount | tr -s '\t' ' ' | grep -F "$device " | cut -d' ' -f2 | head -1`
     [ "$res" = "" ] && res="-1"
     echo $res