Changeset 305 in MondoRescue for branches/2.06/mondo/mondo
- Timestamp:
- Jan 12, 2006, 5:37:42 PM (18 years ago)
- Location:
- branches/2.06/mondo/mondo
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.06/mondo/mondo/common/libmondo-archive.c
r296 r305 545 545 if (g_tmpfs_mountpt[0] != '\0') { 546 546 i = atoi(call_program_and_get_last_line_of_output 547 ("df -m | grep dev/shm | grep -v none | tr -s ' ' '\t' | cut -f4"));547 ("df -m -P | grep dev/shm | grep -v none | tr -s ' ' '\t' | cut -f4")); 548 548 if (i > 0) { 549 549 if (free_ramdisk_space > i) { -
branches/2.06/mondo/mondo/common/libmondo-devices.c
r275 r305 2523 2523 strcpy(tmp, 2524 2524 call_program_and_get_last_line_of_output 2525 ("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;}'"));2525 ("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;}'")); 2526 2526 #else 2527 2527 strcpy(tmp, 2528 2528 call_program_and_get_last_line_of_output 2529 ("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;}'"));2529 ("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;}'")); 2530 2530 #endif 2531 2531 -
branches/2.06/mondo/mondo/common/libmondo-tools.c
r275 r305 1014 1014 assert_string_is_neither_NULL_nor_zerolength(partition); 1015 1015 1016 sprintf(command, "df -m %s &> /dev/null", partition);1016 sprintf(command, "df -m -P %s &> /dev/null", partition); 1017 1017 if (system(command)) { 1018 1018 return (-1); 1019 1019 } // partition does not exist 1020 sprintf(command, "df -m %s | tail -n1 | tr -s ' ' '\t' | cut -f4",1020 sprintf(command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4", 1021 1021 partition); 1022 1022 strcpy(out_sz, call_program_and_get_last_line_of_output(command)); -
branches/2.06/mondo/mondo/mondorestore/mondo-rstr-tools.c
r273 r305 469 469 strcat(mount_isodir_command, " -o ro "); 470 470 strcat(mount_isodir_command, bkpinfo->isodir); 471 run_program_and_log_output("df - m", FALSE);471 run_program_and_log_output("df -P -m", FALSE); 472 472 sprintf(tmp, 473 473 "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?", … … 653 653 } 654 654 close_progress_form(); 655 run_program_and_log_output("df - m", TRUE);655 run_program_and_log_output("df -P -m", TRUE); 656 656 if (retval) { 657 657 if (g_partition_table_locked_up > 0) { … … 679 679 mvaddstr_and_log_it(g_currentY++, 74, "Done."); 680 680 } 681 run_program_and_log_output("df - m", 3);681 run_program_and_log_output("df -P -m", 3); 682 682 paranoid_free(mountlist); 683 683 paranoid_free(tmp); … … 2239 2239 sort_mountlist_by_mountpoint(mountlist, 0); 2240 2240 2241 run_program_and_log_output("df - m", 3);2241 run_program_and_log_output("df -P -m", 3); 2242 2242 mvaddstr_and_log_it(g_currentY, 0, "Unmounting devices "); 2243 2243 open_progress_form("Unmounting devices", -
branches/2.06/mondo/mondo/restore-scripts/mondo/grub-install.patched
r30 r305 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.