Browse Source

Avoided to override EFI type GUID by output of -report_system_area as_mkisofs

master
Thomas Schmitt 6 months ago
parent
commit
e3df75772e
  1. 7
      xorriso/iso_img.c
  2. 2
      xorriso/xorriso_timestamp.h

7
xorriso/iso_img.c

@ -1570,7 +1570,7 @@ static int Xorriso_register_eltorito_gpt(struct XorrisO *xorriso,
{
if(flag & 1) {
if(ptype == 1 || ptype == 3)
et_img->do_gpt_basdat= 1;
et_img->do_gpt_basdat= ptype;
else if(ptype == 2)
et_img->do_gpt_hfsplus= 1;
return(1);
@ -2818,7 +2818,10 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
Text_shellsafe(et_imgs[idx].sel_crit, buf, 1);
Xorriso_record_cmd_linE
}
if(et_imgs[idx].do_gpt_basdat) {
if(et_imgs[idx].do_gpt_basdat &&
!(et_imgs[idx].do_gpt_basdat == 3 &&
strstr(et_imgs[idx].path, "--interval:appended_partition_") ==
et_imgs[idx].path)) { /* (not with appended EFI partition) */
if(mkisofs)
sprintf(buf, "-isohybrid-gpt-basdat");
else

2
xorriso/xorriso_timestamp.h

@ -1 +1 @@
#define Xorriso_timestamP "2021.03.12.083144"
#define Xorriso_timestamP "2021.04.04.181609"

Loading…
Cancel
Save