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

Making use of -eltorito-platform with -report_el_torito as_mkisofs

Browse Source
This commit is contained in:
Thomas Schmitt 2017-06-03 21:35:22 +02:00
parent c9df1a1f90
commit 3d66432861
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xorriso/iso_img.c
View File

@ -1647,6 +1647,7 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
int cared_for_sparc= 0, have_hfsplus= 0; int cared_for_sparc= 0, have_hfsplus= 0;
int have_sysarea= 0, ptable_killer, imported_iso, have_alpha_ldr_path= 0; int have_sysarea= 0, ptable_killer, imported_iso, have_alpha_ldr_path= 0;
int have_protective_msdos= 0, appended_partition= 0, part_like_isohybrid= 0; int have_protective_msdos= 0, appended_partition= 0, part_like_isohybrid= 0;
unsigned int prev_pltf= 0;
unsigned long int sa_options= 0, partno, id_tag, perms, start_cyl, num_blocks; unsigned long int sa_options= 0, partno, id_tag, perms, start_cyl, num_blocks;
unsigned long int part_status, part_type, start_block; unsigned long int part_status, part_type, start_block;
uint32_t high_block= 0; uint32_t high_block= 0;
@ -2516,24 +2517,22 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
continue; continue;
} }
} }
if(et_imgs[idx].platform_id == 0) { if(et_imgs[idx].platform_id != 0xef) {
if(mkisofs) if(mkisofs) {
if(prev_pltf != et_imgs[idx].platform_id) {
sprintf(buf, "-eltorito-platform 0x%2.2x", et_imgs[idx].platform_id);
Xorriso_record_cmd_linE
}
prev_pltf= et_imgs[idx].platform_id;
sprintf(buf, "-b "); sprintf(buf, "-b ");
else } else {
sprintf(buf, "-boot_image %s bin_path=", et_imgs[idx].boot_image_type); sprintf(buf, "-boot_image %s bin_path=", et_imgs[idx].boot_image_type);
} else if(et_imgs[idx].platform_id == 0xef) { }
} else {
if(mkisofs) if(mkisofs)
sprintf(buf, "-e "); sprintf(buf, "-e ");
else else
sprintf(buf, "-boot_image %s efi_path=", et_imgs[idx].boot_image_type); sprintf(buf, "-boot_image %s efi_path=", et_imgs[idx].boot_image_type);
} else {
if(mkisofs && !(flag & 1)) {
sprintf(xorriso->info_text,
"Cannot enable EL Torito boot image #%d because Platform Id 0x%2.2x cannot be expressed in mkisofs emulation",
idx + 1, et_imgs[idx].platform_id);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0);
continue;
}
} }
Text_shellsafe(et_imgs[idx].path, buf, 1); Text_shellsafe(et_imgs[idx].path, buf, 1);
Xorriso_record_cmd_linE Xorriso_record_cmd_linE

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2017.06.03.163742" #define Xorriso_timestamP "2017.06.03.193458"