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

Clarified meaning of xorriso->patch_isolinux_image in Xorriso_make_iso_write_opts()

Browse Source
This commit is contained in:
Thomas Schmitt 2014-12-29 14:22:29 +00:00
parent 4e3e138947
commit 20960d3806
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libisoburn/trunk/xorriso/write_run.c
View File

@ -760,12 +760,13 @@ int Xorriso_make_iso_write_opts(struct XorrisO *xorriso, IsoImage *image,
relax= xorriso->relax_compliance;
if(image != NULL)
is_bootable= iso_image_get_boot_image(image, NULL, NULL, NULL);
if(xorriso->patch_isolinux_image & 1) {
if(is_bootable == 1)
/* xorriso->patch_isolinux_image gets reset in Xorriso_attach_boot_image()
So this applies only to -boot_image ... "patch" or "keep".
>>> Better would be to analyze and keep the relaxations of the loaded image.
*/
if((xorriso->patch_isolinux_image & 1) && is_bootable == 1)
relax|= isoburn_igopt_allow_full_ascii;
else if(xorriso->keep_boot_image && is_bootable == 1)
relax|= isoburn_igopt_allow_full_ascii;
}
out_cs= xorriso->out_charset;
if(out_cs == NULL)
@ -2633,6 +2634,10 @@ int Xorriso_set_isolinux_options(struct XorrisO *xorriso,
{ret= 0; goto ex;}
continue;
}
/* <<< From here on only with first boot image and
deprecated builtin isohybrid MBR */
if(xorriso->boot_image_isohybrid == 3) {
make_isohybrid_mbr= 1;
} else {

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2014.12.29.105732"
#define Xorriso_timestamP "2014.12.29.142036"