Changeset 1796 in MondoRescue for branches

Timestamp:

Nov 14, 2007, 1:59:56 AM (18 years ago)

Author:

Bruno Cornec

Message:

Finally do not use vdf for ESX. Only creates issues.

File:

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

branches/2.2.5/mindi/mindi

@@ -2056 +2056 @@
     if [ "$ARCH" = "ia64" ] ; then
         mountefi=0
-        $DF -T | grep /boot/efi | grep -q vfat
+        df -T | grep /boot/efi | grep -q vfat
         if [ $? -ne 0 ]; then
             mount /boot/efi
@@ -2096 +2096 @@
     [ "$mountpoint" != "" ] && rm -Rf $mountpoint/lost+found
     dd if=/dev/zero of=$mountpoint/zero bs=1k count=16 &> /dev/null
-    free_space=`$DF -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
+    free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     cp -f $kernelpath $mountpoint/vmlinuz > /dev/null 2> /dev/null
     if [ "$?" -ne "0" ] || [ "$FORCE_DUAL_FLOPPIES" = "yes" ] ; then
@@ -2121 +2121 @@
         return $res
     fi
-    free_space=`$DF -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
+    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 floppy = $free_space KB" >> $LOGFILE
@@ -2236 +2236 @@
     [ "$mountpoint" != "" ] && rm -Rf $mountpoint/lost+found
     dd if=/dev/zero of=$mountpoint/zero bs=1k count=16 &> /dev/null
-    free_space=`$DF -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
+    free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     cp -f $kernelpath $mountpoint/vmlinuz &> /dev/null
     if [ "$?" -ne "0" ] || [ "$FORCE_DUAL_FLOPPIES" = "yes" ] ; then
@@ -2261 +2261 @@
         return $res
     fi
-    free_space=`$DF -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
+    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 floppy = $free_space KB" >> $LOGFILE
@@ -2524 +2524 @@
     res=`$FDISK -s $device 2>> $LOGFILE`
     # end patch
-    [ "$res" = "" ] && res=`$DF -k -P -x supermount | tr -s '\t' ' ' | grep -F "$device " | cut -d' ' -f2`
+    [ "$res" = "" ] && res=`df -k -P -x supermount | tr -s '\t' ' ' | grep -F "$device " | cut -d' ' -f2`
     [ "$res" = "" ] && res="-1"
     echo $res
@@ -3190 +3190 @@
 lsmod >> $LOGFILE
 MODULES="`cat /proc/modules | awk '{print $1}'`"
-DF="/bin/df"
 if [ -x /usr/sbin/esxcfg-module ]; then
     echo "VMWare ESX server detected - Enabling dedicated support" >> $LOGFILE
@@ -3198 +3197 @@
     /usr/sbin/esxcfg-module -l >> $LOGFILE
     MODULES="$MODULES `/usr/sbin/esxcfg-module -l | awk '{print $1}'`"
-    #DF="/usr/sbin/vdf"
 fi
 echo "-------------" >> $LOGFILE
-echo "`basename $DF` result:" >> $LOGFILE
+echo "df result:" >> $LOGFILE
 echo "----------" >> $LOGFILE
-$DF -T >> $LOGFILE
+df -T >> $LOGFILE
 echo "-------------" >> $LOGFILE
 echo "Liste of extra modules is:" >> $LOGFILE