Changeset 2448 in MondoRescue

Timestamp:

Oct 5, 2009, 11:06:13 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Fix for #288: only take the first result in SizeOfPartition in case of multiple mounts

File:

• branches/2.2.9/mindi/mindi (modified) (3 diffs)

branches/2.2.9/mindi/mindi

@@ -1708 +1708 @@
         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`))
     echo "Free space left on image = $free_space KB" >> $LOGFILE
@@ -1803 +1802 @@
         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`))
     echo "Free space left on image = $free_space KB" >> $LOGFILE
@@ -2046 +2044 @@
     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