Ignore:
Timestamp:
Feb 17, 2016, 2:22:11 AM (4 years ago)
Author:
Bruno Cornec
Message:
  • Fixes xorriso usage and options differences wrt genisoimage
  • Improve temporary file removal, by adding star file to the list, and
  • Try to fix #784 by not comparing result of mkstmp to NULL
File:
1 edited

Legend:

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

    r3506 r3514  
    17451745                if (bkpinfo->boot_type == UEFI) {
    17461746                    if (strstr(isofs_cmd,"xorriso")) {
    1747                         mr_asprintf(uefistr, "%s", MONDO_XORRISO_UEFI);
     1747                        /*  xorriso needs another '-' before efi-boot */
     1748                        mr_asprintf(uefistr, "-%s", MONDO_MKISOFS_UEFI);
    17481749                    } else {
    17491750                        mr_asprintf(uefistr, "%s", MONDO_MKISOFS_UEFI);
    17501751                    }
    17511752                } else {
    1752                     mr_asprintf(uefistr, " ");
     1753                    mr_asprintf(uefistr, "%s",MONDO_MKISOFS_CMS);
    17531754                }
    17541755                mr_asprintf(full_isofs_cmd, "%s%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr);
     
    29552956
    29562957    mr_asprintf(dir, "%s/archives", d);
    2957     mr_asprintf(tmp, "find %s -name '*.afio*' -o -name '*.star.' -exec rm -f '{}' \\;", dir);
     2958    mr_asprintf(tmp, "find %s -name '*.afio.*' -o -name '*.star.*' -exec rm -f '{}' \\;", dir);
    29582959    run_program_and_log_output(tmp, FALSE);
    29592960    mr_free(tmp);
Note: See TracChangeset for help on using the changeset viewer.