Changeset 309 in MondoRescue for trunk/mondo/mondo
- Timestamp:
- Jan 13, 2006, 12:23:00 AM (18 years ago)
- Location:
- trunk/mondo/mondo
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/mondo/common/libmondo-archive.c
r300 r309 391 391 if (g_tmpfs_mountpt[0] != '\0') { 392 392 i = atoi(call_program_and_get_last_line_of_output 393 ("df -m | grep dev/shm | grep -v none | tr -s ' ' '\t' | cut -f4"));393 ("df -m -P | grep dev/shm | grep -v none | tr -s ' ' '\t' | cut -f4")); 394 394 if (i > 0) { 395 395 if (free_ramdisk_space > i) { -
trunk/mondo/mondo/common/libmondo-devices.c
r276 r309 2066 2066 asprintf(&tmp, 2067 2067 call_program_and_get_last_line_of_output 2068 ("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;}'"));2068 ("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;}'")); 2069 2069 #else 2070 2070 asprintf(&tmp, 2071 2071 call_program_and_get_last_line_of_output 2072 ("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;}'"));2072 ("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;}'")); 2073 2073 #endif 2074 2074 -
trunk/mondo/mondo/common/libmondo-tools.c
r276 r309 782 782 assert_string_is_neither_NULL_nor_zerolength(partition); 783 783 784 asprintf(&command, "df -m %s &> /dev/null", partition);784 asprintf(&command, "df -m -P %s &> /dev/null", partition); 785 785 if (system(command)) { 786 786 return (-1); … … 788 788 paranoid_free(command); 789 789 790 asprintf(&command, "df -m %s | tail -n1 | tr -s ' ' '\t' | cut -f4",790 asprintf(&command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4", 791 791 partition); 792 792 asprintf(&out_sz, call_program_and_get_last_line_of_output(command)); -
trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c
r274 r309 451 451 strcat(mount_isodir_command, " -o ro "); 452 452 strcat(mount_isodir_command, bkpinfo->isodir); 453 run_program_and_log_output("df - m", FALSE);453 run_program_and_log_output("df -P -m", FALSE); 454 454 sprintf(tmp, 455 455 "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?", … … 635 635 } 636 636 close_progress_form(); 637 run_program_and_log_output("df - m", TRUE);637 run_program_and_log_output("df -P -m", TRUE); 638 638 if (retval) { 639 639 if (g_partition_table_locked_up > 0) { … … 661 661 mvaddstr_and_log_it(g_currentY++, 74, "Done."); 662 662 } 663 run_program_and_log_output("df - m", 3);663 run_program_and_log_output("df -P -m", 3); 664 664 paranoid_free(mountlist); 665 665 paranoid_free(tmp); … … 2221 2221 sort_mountlist_by_mountpoint(mountlist, 0); 2222 2222 2223 run_program_and_log_output("df - m", 3);2223 run_program_and_log_output("df -P -m", 3); 2224 2224 mvaddstr_and_log_it(g_currentY, 0, "Unmounting devices "); 2225 2225 open_progress_form("Unmounting devices", -
trunk/mondo/mondo/restore-scripts/mondo/grub-install.patched
r30 r309 257 257 # For now, this uses the program `df' to get the device name, but is 258 258 # this really portable? 259 tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^ ]*\).*%\1%p'`259 tmp_fname=`df -P $1/ | sed -n 's%.*\(/dev/[^ ]*\).*%\1%p'` 260 260 261 261 if test -z "$tmp_fname"; then
Note:
See TracChangeset
for help on using the changeset viewer.