From a6328e82fc638fb9914c5abb9729b5a28e33b58d Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 29 Sep 2019 22:54:19 +0200 Subject: [PATCH] Prevented -report_system_area as_mkisofs from combining -efi-boot-part with -e --interval:appended_partition --- xorriso/iso_img.c | 4 ++-- xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xorriso/iso_img.c b/xorriso/iso_img.c index c1e94e4b..2d86f5b1 100644 --- a/xorriso/iso_img.c +++ b/xorriso/iso_img.c @@ -2518,7 +2518,7 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso, if(elto_count <= 0) goto after_el_torito; - if(efi_boot_part) { + if(efi_boot_part == 1) { if(mkisofs) sprintf(buf, "-efi-boot-part --efi-boot-image"); else @@ -2593,7 +2593,7 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso, (unsigned long) mbrpts[i].block_count); et_imgs[idx].path= app_pseudo_paths[idx]; } - if (et_imgs[idx].path[0] == 0) { + if (et_imgs[idx].path[0] == 0 && efi_boot_part != 2) { for(i= 0; i < gpt_count; i++) { if(have_protective_msdos && ( gpts[i].start_block == ((uint64_t) et_imgs[idx].lba) * 4 && diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index afcae335..35c051f0 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2019.09.08.102946" +#define Xorriso_timestamP "2019.09.29.205332"