Changeset 309 in MondoRescue for trunk/mondo


Ignore:
Timestamp:
Jan 13, 2006, 12:23:00 AM (18 years ago)
Author:
bcornec
Message:

merge -r303:308 $SVN_M/branches/2.06

Location:
trunk/mondo
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/mondo/ChangeLog

    r300 r309  
    2020- Replaced partimagehack with ntfsclone from ntfsprogs package.
    2121  (Andree Leidenfrost)
     22- use df -P everywhere (Bruno Cornec)
    2223
    2324v2.06 (2005-12-23)

  • trunk/mondo/mondo/common/libmondo-archive.c

    r300 r309  
    391391    if (g_tmpfs_mountpt[0] != '\0') {
    392392        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"));
    394394        if (i > 0) {
    395395            if (free_ramdisk_space > i) {

  • trunk/mondo/mondo/common/libmondo-devices.c

    r276 r309  
    20662066    asprintf(&tmp,
    20672067           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;}'"));
    20692069#else
    20702070    asprintf(&tmp,
    20712071           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;}'"));
    20732073#endif
    20742074

  • trunk/mondo/mondo/common/libmondo-tools.c

    r276 r309  
    782782    assert_string_is_neither_NULL_nor_zerolength(partition);
    783783
    784     asprintf(&command, "df -m %s &> /dev/null", partition);
     784    asprintf(&command, "df -m -P %s &> /dev/null", partition);
    785785    if (system(command)) {
    786786        return (-1);
    … …  
    788788    paranoid_free(command);
    789789
    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",
    791791             partition);
    792792    asprintf(&out_sz, call_program_and_get_last_line_of_output(command));

  • trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

    r274 r309  
    451451        strcat(mount_isodir_command, " -o ro ");
    452452        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);
    454454        sprintf(tmp,
    455455                "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
    … …  
    635635    }
    636636    close_progress_form();
    637     run_program_and_log_output("df -m", TRUE);
     637    run_program_and_log_output("df -P -m", TRUE);
    638638    if (retval) {
    639639        if (g_partition_table_locked_up > 0) {
    … …  
    661661        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    662662    }
    663     run_program_and_log_output("df -m", 3);
     663    run_program_and_log_output("df -P -m", 3);
    664664    paranoid_free(mountlist);
    665665    paranoid_free(tmp);
    … …  
    22212221    sort_mountlist_by_mountpoint(mountlist, 0);
    22222222
    2223     run_program_and_log_output("df -m", 3);
     2223    run_program_and_log_output("df -P -m", 3);
    22242224    mvaddstr_and_log_it(g_currentY, 0, "Unmounting devices      ");
    22252225    open_progress_form("Unmounting devices",

  • trunk/mondo/mondo/restore-scripts/mondo/grub-install.patched

    r30 r309  
    257257    # For now, this uses the program `df' to get the device name, but is
    258258    # 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'`
    260260
    261261    if test -z "$tmp_fname"; then
Note: See TracChangeset for help on using the changeset viewer.