Ignore:
Timestamp:
Apr 10, 2008, 1:13:58 AM (11 years ago)
Author:
bruno
Message:

merge -r 1842:1889 2.2.5

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/mondorestore/mondorestore.c

    r1770 r1903  
    437437    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
    438438    iamhere("Done loading config file; resizing ML");
    439     if (bkpinfo->backup_media_type != usb) {
     439    if (bkpinfo->backup_media_type == nfs) {
    440440        mr_asprintf(&tmp,bkpinfo->prefix);
    441441        if (popup_and_get_string
     
    19941994                       _("Please wait. This may take some time."),
    19951995                       "", total_slices);
    1996     for (bigfileno = 0, finished = FALSE; !finished;) {
     1996    for (bigfileno = 0 ; bigfileno < noof_biggiefiles ;) {
    19971997        mr_msg(2, "Thinking about restoring bigfile %ld", bigfileno + 1);
    19981998        if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
     
    20042004                    g_current_media_number);
    20052005            mr_msg(3, "Slicename would have been %s",
    2006                     slice_fname(bigfileno + 1, 0, ARCHIVES_PATH, ""));
     2006                    slice_fname(bigfileno, 0, ARCHIVES_PATH, ""));
    20072007            // I'm not positive 'just_changed_cds' is even necessary...
    20082008            if (just_changed_cds) {
     
    20172017                just_changed_cds = TRUE;
    20182018            } else {
     2019                /* That big file doesn't exist, but the followings may */
     2020                /* So we need to continue looping */
    20192021                mr_msg(2, "There was no bigfile #%ld. That's OK.",
    2020                         bigfileno + 1);
     2022                    bigfileno + 1);
    20212023                mr_msg(2, "I'm going to stop restoring bigfiles now.");
    2022                 finished = TRUE;
     2024                retval++;
     2025                bigfileno++;
    20232026            }
    20242027        } else {
     
    30123015    }
    30133016
     3017    if (argc == 3 && strcmp(argv[1], "-K") == 0) {
     3018        g_loglevel = atoi(argv[2]);
     3019        log_msg(1,"Loglevel forced to %s",g_loglevel);
     3020    }
    30143021
    30153022    if (argc == 2 && strcmp(argv[1], "--live-grub") == 0) {
     
    31693176            mvaddstr_and_log_it(g_currentY++,
    31703177                                0,
    3171                                 _("Run complete. Please remove CD/media and reboot."));
     3178                                _("Run complete. Please remove media and reboot."));
    31723179        } else {
    31733180            run_program_and_log_output("sync", FALSE);
     
    32263233    unlink("/tmp/mondo-run-prog.tmp");
    32273234    set_signals(FALSE);
    3228     mr_asprintf(&tmp, "rm -Rf %s", bkpinfo->tmpdir);
    3229     run_program_and_log_output(tmp, FALSE);
    3230     mr_free(tmp);
    32313235
    32323236    log_to_screen
     
    32433247        run_program_and_log_output("mount / -o remount,rw", 2);
    32443248    }                           // for b0rken distros
     3249    mr_asprintf(&tmp, "rm -Rf %s", bkpinfo->tmpdir);
     3250    run_program_and_log_output(tmp, FALSE);
     3251    mr_free(tmp);
     3252
    32453253    paranoid_MR_finish(retval); // frees global stuff plus bkpinfo
    32463254    free_libmondo_global_strings(); // it's fine to have this here :) really :)
Note: See TracChangeset for help on using the changeset viewer.