Changeset 305 in MondoRescue for branches/2.06/mindi

Timestamp:

Jan 12, 2006, 5:37:42 PM (18 years ago)

Author:

bcornec

Message:

use df -P everywhere to avoid split lines on df output and some bugs

Location:

branches/2.06/mindi

Files:

• aux-tools/sbin/format-and-kludge-vfat (modified) (1 diff)
• mindi (modified) (5 diffs)
• rootfs/sbin/init (modified) (1 diff)

branches/2.06/mindi/aux-tools/sbin/format-and-kludge-vfat

@@ -107 +107 @@
 [ ! -e "/mnt/tmpK" ] && mkdir /mnt/tmpK
 mount $device -t vfat /mnt/tmpK || Die "Can't mount device $device"
-size=`df -m /mnt/tmpK | tr -s ' ' ' ' | cut -d' ' -f2 | tail -n 1`
+size=`df -m -P /mnt/tmpK | tr -s ' ' ' ' | cut -d' ' -f2 | tail -n 1`
 umount /mnt/tmpK || Die "Can't unmount /mnt/tmpK"
 

branches/2.06/mindi/mindi

@@ -1901 +1901 @@
     rm -Rf $mountpoint/lost+found
     dd if=/dev/zero of=$mountpoint/zero bs=1k count=16 &> /dev/null
-    free_space=`df -k $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
@@ -1924 +1924 @@
     return $res
     fi
-    free_space=`df -k $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
@@ -2038 +2038 @@
     rm -Rf $mountpoint/lost+found
     dd if=/dev/zero of=$mountpoint/zero bs=1k count=16 &> /dev/null
-    free_space=`df -k $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
@@ -2061 +2061 @@
         return $res
     fi
-    free_space=`df -k $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
@@ -2410 +2410 @@
     echo "------- $FDISK log end ------------" >> $LOGFILE
 # end patch
-    [ "$res" = "" ] && res=`df -k -x supermount | tr -s '\t' ' ' | fgrep "$device " | cut -d' ' -f2`
+    [ "$res" = "" ] && res=`df -k -P -x supermount | tr -s '\t' ' ' | fgrep "$device " | cut -d' ' -f2`
     [ "$res" = "" ] && res="-1"
     echo $res

branches/2.06/mindi/rootfs/sbin/init

@@ -342 +342 @@
 
 HowMuchFreeSpaceOnRamdisk() {
-   df -m | grep /dev/ram | head -n1 | tr -s '\t' ' ' | cut -d' ' -f4
+   df -m -P | grep /dev/ram | head -n1 | tr -s '\t' ' ' | cut -d' ' -f4
 }