Browse Source

Prevented -report_system_area as_mkisofs from combining -efi-boot-part with -e --interval:appended_partition

master
Thomas Schmitt 3 years ago
parent
commit
a6328e82fc
  1. 4
      xorriso/iso_img.c
  2. 2
      xorriso/xorriso_timestamp.h

4
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 &&

2
xorriso/xorriso_timestamp.h

@ -1 +1 @@
#define Xorriso_timestamP "2019.09.08.102946"
#define Xorriso_timestamP "2019.09.29.205332"

Loading…
Cancel
Save