Ignore:
Timestamp:
Mar 22, 2010, 1:56:17 PM (10 years ago)
Author:
bruno
Message:

r3755@localhost: bruno | 2010-03-16 22:03:43 +0100

  • Fix incorrect usage of all.tar.gz at restore time.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mondo/src/common/libmondo-archive.c

    r2598 r2601  
    844844        mr_free(command);
    845845
    846         if (bkpinfo->nonbootable_backup) {
    847             mr_asprintf(command, "cp -f %s/all.tar.gz %s/images", bkpinfo->tmpdir, bkpinfo->scratchdir);
    848             if (system(command)) {
    849                 mr_free(command);
    850                 fatal_error("Unable to create temporary all tarball");
    851             }
     846        mr_asprintf(command, "cp -f /%s/all.tar.gz %s/images", MINDI_CACHE_REL, bkpinfo->scratchdir);
     847        if (system(command)) {
    852848            mr_free(command);
    853         }
     849            fatal_error("Unable to create temporary all tarball");
     850        }
     851        mr_free(command);
     852
    854853        /* For USB we already have everything on the key */
    855854        if (bkpinfo->backup_media_type == usb) {
     
    857856            run_program_and_log_output(command, FALSE);
    858857            mr_free(command);
    859         } else {
    860             mr_asprintf(tmp, "cp -f /%s/all.tar.gz %s", MINDI_CACHE_REL, bkpinfo->tmpdir);
    861             if (system(tmp)) {
    862                 mr_free(tmp);
    863                 fatal_error("Cannot find all.tar.gz in tmpdir");
    864             }
    865             mr_free(tmp);
    866858        }
    867859        if (res) {
     
    11301122
    11311123    assert(bkpinfo != NULL);
    1132     mr_asprintf(data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
     1124    mr_asprintf(data_disks_file, "/%s/all.tar.gz", MINDI_CACHE_REL);
    11331125
    11341126    g_serial_string = call_program_and_get_last_line_of_output("dd  if=/dev/urandom bs=16 count=1 2> /dev/null |  hexdump | tr -s ' ' '0' | head -n1");
Note: See TracChangeset for help on using the changeset viewer.