Changeset 1785


Ignore:
Timestamp:
Nov 11, 2007, 1:43:12 AM (12 years ago)
Author:
bruno
Message:

Use variable DF in mindi to be able to support the ESX vdf

Location:
branches/2.2.5
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi/mindi

    r1784 r1785  
    20562056    if [ "$ARCH" = "ia64" ] ; then
    20572057        mountefi=0
    2058         df -T | grep /boot/efi | grep -q vfat
     2058        $DF -T | grep /boot/efi | grep -q vfat
    20592059        if [ $? -ne 0 ]; then
    20602060            mount /boot/efi
     
    20962096    [ "$mountpoint" != "" ] && rm -Rf $mountpoint/lost+found
    20972097    dd if=/dev/zero of=$mountpoint/zero bs=1k count=16 &> /dev/null
    2098     free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     2098    free_space=`$DF -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
    20992099    cp -f $kernelpath $mountpoint/vmlinuz > /dev/null 2> /dev/null
    21002100    if [ "$?" -ne "0" ] || [ "$FORCE_DUAL_FLOPPIES" = "yes" ] ; then
     
    21212121        return $res
    21222122    fi
    2123     free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     2123    free_space=`$DF -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
    21242124    max_kernel_size=$(($free_space+`du -sk $kernelpath | cut -f1`))
    21252125    echo "Free space left on floppy = $free_space KB" >> $LOGFILE
     
    22362236    [ "$mountpoint" != "" ] && rm -Rf $mountpoint/lost+found
    22372237    dd if=/dev/zero of=$mountpoint/zero bs=1k count=16 &> /dev/null
    2238     free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     2238    free_space=`$DF -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
    22392239    cp -f $kernelpath $mountpoint/vmlinuz &> /dev/null
    22402240    if [ "$?" -ne "0" ] || [ "$FORCE_DUAL_FLOPPIES" = "yes" ] ; then
     
    22612261        return $res
    22622262    fi
    2263     free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     2263    free_space=`$DF -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
    22642264    max_kernel_size=$(($free_space+`du -sk $kernelpath | cut -f1`))
    22652265    echo "Free space left on floppy = $free_space KB" >> $LOGFILE
     
    25242524    res=`$FDISK -s $device 2>> $LOGFILE`
    25252525    # end patch
    2526     [ "$res" = "" ] && res=`df -k -P -x supermount | tr -s '\t' ' ' | grep -F "$device " | cut -d' ' -f2`
     2526    [ "$res" = "" ] && res=`$DF -k -P -x supermount | tr -s '\t' ' ' | grep -F "$device " | cut -d' ' -f2`
    25272527    [ "$res" = "" ] && res="-1"
    25282528    echo $res
     
    31653165echo "LVM set to $LVM" >> $LOGFILE
    31663166echo "----------" >> $LOGFILE
    3167 echo "df result:" >> $LOGFILE
    3168 echo "----------" >> $LOGFILE
    3169 df -T >> $LOGFILE
    3170 echo "-------------" >> $LOGFILE
    31713167echo "mount result:" >> $LOGFILE
    31723168echo "-------------" >> $LOGFILE
     
    31883184lsmod >> $LOGFILE
    31893185MODULES="`cat /proc/modules | awk '{print $1}'`"
     3186DF="/bin/df"
    31903187if [ -x /usr/sbin/esxcfg-module ]; then
    31913188    echo "VMWare ESX server detected - Enabling dedicated support" >> $LOGFILE
     
    31953192    /usr/sbin/esxcfg-module -l >> $LOGFILE
    31963193    MODULES="$MODULES `/usr/sbin/esxcfg-module -l | awk '{print $1}'`"
     3194    DF="/bin/vdf"
    31973195fi
     3196echo "-------------" >> $LOGFILE
     3197echo "`basename $DF` result:" >> $LOGFILE
     3198echo "----------" >> $LOGFILE
     3199$DF -T >> $LOGFILE
    31983200echo "-------------" >> $LOGFILE
    31993201echo "Liste of extra modules is:" >> $LOGFILE
  • branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools.c

    r1771 r1785  
    703703}
    704704close_progress_form();
    705 run_program_and_log_output("df -m", TRUE);
    706705if (retval) {
    707706if (g_partition_table_locked_up > 0) {
Note: See TracChangeset for help on using the changeset viewer.