libburnia/libisoburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

With report_system_area of iso_mbr_part_type: give MBR precedence over GPT

Browse Source
This commit is contained in:
Thomas Schmitt 2019-07-22 20:14:53 +02:00
parent 3b0abc14c0
commit 397551f9d4
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xorriso/iso_img.c
View File

@ -2494,7 +2494,16 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
Xorriso_record_cmd_linE Xorriso_record_cmd_linE
did_sysarea= 1; did_sysarea= 1;
} }
if(iso_gpt_part_idx >= 0) { if(iso_mbr_part_type >= 0) {
if(mkisofs)
sprintf(buf, "-iso_mbr_part_type 0x%2.2x",
(unsigned int) iso_mbr_part_type);
else
sprintf(buf, "-boot_image any iso_mbr_part_type=0x%2.2x",
(unsigned int) iso_mbr_part_type);
Xorriso_record_cmd_linE
} else if(iso_gpt_part_idx >= 0) {
if(mkisofs) if(mkisofs)
sprintf(buf, "-iso_mbr_part_type "); sprintf(buf, "-iso_mbr_part_type ");
else else
@ -2503,14 +2512,6 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
0); 0);
Xorriso_record_cmd_linE Xorriso_record_cmd_linE
} else if(iso_mbr_part_type >= 0) {
if(mkisofs)
sprintf(buf, "-iso_mbr_part_type 0x%2.2x",
(unsigned int) iso_mbr_part_type);
else
sprintf(buf, "-boot_image any iso_mbr_part_type=0x%2.2x",
(unsigned int) iso_mbr_part_type);
Xorriso_record_cmd_linE
} }
/* Issue commands related to El Torito */ /* Issue commands related to El Torito */

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2019.07.13.153027" #define Xorriso_timestamP "2019.07.22.181418"