Changeset 305 in MondoRescue

Timestamp:

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

Author:

bcornec

Message:

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

Location:

branches/2.06

Files:

• mindi/aux-tools/sbin/format-and-kludge-vfat (modified) (1 diff)
• mindi/mindi (modified) (5 diffs)
• mindi/rootfs/sbin/init (modified) (1 diff)
• mondo/ChangeLog (modified) (1 diff)
• mondo/mondo/common/libmondo-archive.c (modified) (1 diff)
• mondo/mondo/common/libmondo-devices.c (modified) (1 diff)
• mondo/mondo/common/libmondo-tools.c (modified) (1 diff)
• mondo/mondo/mondorestore/mondo-rstr-tools.c (modified) (4 diffs)
• mondo/mondo/restore-scripts/mondo/grub-install.patched (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
 }
 

branches/2.06/mondo/ChangeLog

@@ -14 +14 @@
 - Replaced partimagehack with ntfsclone from ntfsprogs package.
   (Andree Leidenfrost)
+- use df -P everywhere (Bruno Cornec)
 
 v2.06 (2005-12-23)

branches/2.06/mondo/mondo/common/libmondo-archive.c

@@ -545 +545 @@
     if (g_tmpfs_mountpt[0] != '\0') {
         i = atoi(call_program_and_get_last_line_of_output
-                 ("df -m | grep dev/shm | grep -v none | tr -s ' ' '\t' | cut -f4"));
+                 ("df -m -P | grep dev/shm | grep -v none | tr -s ' ' '\t' | cut -f4"));
         if (i > 0) {
             if (free_ramdisk_space > i) {

branches/2.06/mondo/mondo/common/libmondo-devices.c

@@ -2523 +2523 @@
     strcpy(tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -t nonfs,msdosfs,ntfs,smbfs,smb,cifs | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #else
     strcpy(tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | grep -v /dev/shm | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | grep -v /dev/shm | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #endif
 

branches/2.06/mondo/mondo/common/libmondo-tools.c

@@ -1014 +1014 @@
     assert_string_is_neither_NULL_nor_zerolength(partition);
 
-    sprintf(command, "df -m %s &> /dev/null", partition);
+    sprintf(command, "df -m -P %s &> /dev/null", partition);
     if (system(command)) {
         return (-1);
     }                           // partition does not exist
-    sprintf(command, "df -m %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
+    sprintf(command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
             partition);
     strcpy(out_sz, call_program_and_get_last_line_of_output(command));

branches/2.06/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -469 +469 @@
         strcat(mount_isodir_command, " -o ro ");
         strcat(mount_isodir_command, bkpinfo->isodir);
-        run_program_and_log_output("df -m", FALSE);
+        run_program_and_log_output("df -P -m", FALSE);
         sprintf(tmp,
                 "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
@@ -653 +653 @@
     }
     close_progress_form();
-    run_program_and_log_output("df -m", TRUE);
+    run_program_and_log_output("df -P -m", TRUE);
     if (retval) {
         if (g_partition_table_locked_up > 0) {
@@ -679 +679 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    run_program_and_log_output("df -m", 3);
+    run_program_and_log_output("df -P -m", 3);
     paranoid_free(mountlist);
     paranoid_free(tmp);
@@ -2239 +2239 @@
     sort_mountlist_by_mountpoint(mountlist, 0);
 
-    run_program_and_log_output("df -m", 3);
+    run_program_and_log_output("df -P -m", 3);
     mvaddstr_and_log_it(g_currentY, 0, "Unmounting devices      ");
     open_progress_form("Unmounting devices",

branches/2.06/mondo/mondo/restore-scripts/mondo/grub-install.patched

@@ -257 +257 @@
     # For now, this uses the program `df' to get the device name, but is
     # this really portable?
-    tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^   ]*\).*%\1%p'`
+    tmp_fname=`df -P $1/ | sed -n 's%.*\(/dev/[^    ]*\).*%\1%p'`
 
     if test -z "$tmp_fname"; then