Ignore:
Timestamp:
Jul 30, 2006, 4:06:39 PM (14 years ago)
Author:
Bruno Cornec
Message:

merge -r686:728 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

    r689 r729  
    320320            asprintf(&mount_isodir_command, "mount %s -o ro %s", g_isodir_device, bkpinfo->isodir);
    321321        }
    322         run_program_and_log_output("df -P -m", FALSE);
     322        run_program_and_log_output("df -m", FALSE);
    323323        asprintf(&tmp,
    324324                "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
     
    445445    }
    446446    close_progress_form();
    447     run_program_and_log_output("df -P -m", TRUE);
     447    run_program_and_log_output("df -m", TRUE);
    448448    if (retval) {
    449449        if (g_partition_table_locked_up > 0) {
     
    476476        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
    477477    }
    478     run_program_and_log_output("df -P -m", 3);
     478    run_program_and_log_output("df -m", 3);
    479479    paranoid_free(mountlist);
    480480    return (retval);
     
    766766                               FALSE);
    767767    run_program_and_log_output("cd " MNT_RESTORING
    768                                "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir $i/.disabled ; mv -f $i/.DCOP* $i/.MCOP* $i/.*authority $i/.kde/tmp* $i/.kde/socket* $i/.disabled/ ; done",
     768                               "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir \"$i\"/.disabled ; mv -f \"$i\"/.DCOP* \"$i\"/.MCOP* \"$i\"/.*authority \"$i\"/.kde/tmp* \"$i\"/.kde/socket* \"$i\"/.disabled/ ; done",
    769769                               TRUE);
    770770    run_program_and_log_output("rm -f " MNT_RESTORING "/var/run/*.pid",
     
    19711971    sort_mountlist_by_mountpoint(mountlist, 0);
    19721972
    1973     run_program_and_log_output("df -P -m", 3);
     1973    run_program_and_log_output("df -m", 3);
    19741974    mvaddstr_and_log_it(g_currentY, 0, _("Unmounting devices      "));
    19751975    open_progress_form(_("Unmounting devices"),
     
    24002400                paranoid_free(screen_message);
    24012401
    2402                 if (raidlist->el[i].progress == -1) // delayed while another partition inits
    2403                 {
     2402                if (raidlist->el[i].progress == -1) { // delayed while another partition inits
    24042403                    continue;
    24052404                }
Note: See TracChangeset for help on using the changeset viewer.