Changeset 3514 in MondoRescue for branches/3.2/mondo/src/common
- Timestamp:
- Feb 17, 2016, 2:22:11 AM (8 years ago)
- Location:
- branches/3.2/mondo/src/common
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mondo/src/common/libmondo-archive.c
r3506 r3514 1745 1745 if (bkpinfo->boot_type == UEFI) { 1746 1746 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); 1748 1749 } else { 1749 1750 mr_asprintf(uefistr, "%s", MONDO_MKISOFS_UEFI); 1750 1751 } 1751 1752 } else { 1752 mr_asprintf(uefistr, " ");1753 mr_asprintf(uefistr, "%s",MONDO_MKISOFS_CMS); 1753 1754 } 1754 1755 mr_asprintf(full_isofs_cmd, "%s%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr); … … 2955 2956 2956 2957 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); 2958 2959 run_program_and_log_output(tmp, FALSE); 2959 2960 mr_free(tmp); -
branches/3.2/mondo/src/common/libmondo-tools.c
r3507 r3514 361 361 char *iso_tmp = NULL; 362 362 char *iso_dir = NULL; 363 char *uefistr = NULL; 363 364 364 365 assert(bkpinfo != NULL); … … 505 506 } 506 507 #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); 510 521 } 511 522 mr_free(isofs_cmd); … … 670 681 char* mkdtemp(char *template) 671 682 { 672 if (mkstemp(template) == NULL) {683 if (mkstemp(template) == -1) { 673 684 return NULL; 674 685 }
Note:
See TracChangeset
for help on using the changeset viewer.