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-tools.c

    r3507 r3514  
    361361    char *iso_tmp = NULL;
    362362    char *iso_dir = NULL;
     363    char *uefistr = NULL;
    363364
    364365    assert(bkpinfo != NULL);
     
    505506    }
    506507#endif
    507         else
    508         {
    509             mr_asprintf(mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_SYSLINUX);
     508        else {
     509            if (bkpinfo->boot_type == UEFI) {
     510                if (strstr(isofs_cmd,"xorriso")) {
     511                    /*  xorriso needs another '-' before efi-boot */
     512                    mr_asprintf(uefistr, "-%s", MONDO_MKISOFS_UEFI);
     513                } else {
     514                    mr_asprintf(uefistr, "%s", MONDO_MKISOFS_UEFI);
     515                }
     516            } else {
     517                mr_asprintf(uefistr, "%s",MONDO_MKISOFS_CMS);
     518            }
     519
     520            mr_asprintf(mondo_mkisofs_sz, "%s%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr);
    510521        }
    511522        mr_free(isofs_cmd);
     
    670681char* mkdtemp(char *template)
    671682{
    672     if (mkstemp(template) == NULL) {
     683    if (mkstemp(template) == -1) {
    673684        return NULL;
    674685    }
Note: See TracChangeset for help on using the changeset viewer.