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

Prevented in -report_system_area "as_mkisofs" a confusion about -appended_part_as_gpt and -part_like_isohybrid

Browse Source
This commit is contained in:
Thomas Schmitt 2017-09-10 18:50:19 +02:00
parent ea8a7591de
commit 3813a747d1
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xorriso/iso_img.c
View File

@ -2174,14 +2174,8 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
} }
} }
if(mbr_idx >= mbr_count) { if(mbr_idx >= mbr_count) {
if(appended_as_gpt == 1) { if(appended_as_gpt == 1)
if(mkisofs)
sprintf(buf, "-appended_part_as_gpt");
else
sprintf(buf, "-boot_image any appended_part_as=gpt");
Xorriso_record_cmd_linE
appended_as_gpt= 2; appended_as_gpt= 2;
}
sprintf(buf, "-append_partition %d 0x%lx ", idx + 1, part_type); sprintf(buf, "-append_partition %d 0x%lx ", idx + 1, part_type);
Xorriso_add_intvl_adr(xorriso, buf, (uint64_t) num[1], Xorriso_add_intvl_adr(xorriso, buf, (uint64_t) num[1],
(uint64_t) (num[1] + num[2] - 1.0), "d", (uint64_t) (num[1] + num[2] - 1.0), "d",
@ -2211,6 +2205,7 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
Xorriso_record_cmd_linE Xorriso_record_cmd_linE
buf[0]= 0; buf[0]= 0;
part_like_isohybrid= 1; part_like_isohybrid= 1;
appended_as_gpt= 0;
} }
/* mark el torito for -isohybrid-gpt-... */ /* mark el torito for -isohybrid-gpt-... */
Xorriso_register_eltorito_gpt(xorriso, et_imgs + et_idx, Xorriso_register_eltorito_gpt(xorriso, et_imgs + et_idx,
@ -2394,6 +2389,14 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
Xorriso_record_cmd_linE Xorriso_record_cmd_linE
} }
if(appended_as_gpt == 2) {
if(mkisofs)
sprintf(buf, "-appended_part_as_gpt");
else
sprintf(buf, "-boot_image any appended_part_as=gpt");
Xorriso_record_cmd_linE
}
if(have_sparc_part) { if(have_sparc_part) {
if(full_sparc_part == 255) { if(full_sparc_part == 255) {
if(mkisofs) { if(mkisofs) {

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2017.09.09.142818" #define Xorriso_timestamP "2017.09.10.164942"