Ignore:
Timestamp:
Mar 17, 2010, 3:55:40 AM (10 years ago)
Author:
Bruno Cornec
Message:

r3742@localhost: bruno | 2010-03-15 01:52:11 +0100

  • Fix mindi/mondoarchive interface for common files
File:
1 edited

Legend:

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

    r2595 r2598  
    839839    if (!res) {
    840840        log_to_screen("Boot+data disks were created OK");
    841         mr_asprintf(command, "cp -f %s/images/mindi.iso %s/mondorescue.iso", bkpinfo->scratchdir, MINDI_CACHE);
     841        mr_asprintf(command, "cp -f /%s/images/mindi.iso %s/mondorescue.iso", MINDI_CACHE_REL, MINDI_CACHE);
    842842        log_msg(2, command);
    843843        run_program_and_log_output(command, FALSE);
     
    858858            mr_free(command);
    859859        } else {
    860             mr_asprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir, bkpinfo->tmpdir);
     860            mr_asprintf(tmp, "cp -f /%s/all.tar.gz %s", MINDI_CACHE_REL, bkpinfo->tmpdir);
    861861            if (system(tmp)) {
    862862                mr_free(tmp);
     
    15821582    char *message_to_screen = NULL;
    15831583    char *sz_blank_disk = NULL;
    1584     char *tmp2 = NULL;
    1585     char *tmp3 = NULL;
    15861584    char *mds = NULL;
    15871585    bool cd_is_mountable;
     
    15911589    assert_string_is_neither_NULL_nor_zerolength(destfile);
    15921590
    1593     mr_asprintf(tmp, "%s/isolinux.bin", bkpinfo->scratchdir);
    1594     mr_asprintf(tmp2, "%s/isolinux.bin", bkpinfo->tmpdir);
    1595     if (does_file_exist(tmp)) {
    1596         mr_asprintf(tmp3, "cp -f %s %s", tmp, tmp2);
    1597         paranoid_system(tmp3);
    1598         mr_free(tmp3);
    1599     }
    1600     if (!does_file_exist(tmp) && does_file_exist(tmp2)) {
    1601         mr_asprintf(tmp3, "cp -f %s %s", tmp2, tmp);
    1602         paranoid_system(tmp3);
    1603         mr_free(tmp3);
    1604     }
    1605     mr_free(tmp2);
     1591    /* Copy the files needed by isolinux in the right dir */
     1592    mr_asprintf(tmp, "mv "MONDO_CACHE"/{isolinux.cfg,isolinux.bin,message.txt,vmlinuz,initrd.img} %s", bkpinfo->scratchdir);
     1593    paranoid_system(tmp);
    16061594    mr_free(tmp);
    16071595
Note: See TracChangeset for help on using the changeset viewer.