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

New -as mkisofs options -isohybrid-gpt-basdat, -isohybrid-gpt-hfsplus, -isohybrid-apm-hfsplus

Browse Source
This commit is contained in:
Thomas Schmitt
2012-06-20 19:06:26 +00:00
parent 08ecc2bdb5
commit 4a61dec017
9 changed files with 168 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
xorriso/opts_a_c.c
View File

@ -667,7 +667,7 @@ cannot_keep_or_patch:;
if(isolinux_grub)
goto treatment_patch;
xorriso->keep_boot_image= 1;
xorriso->patch_isolinux_image= 0;
xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 0;
xorriso->boot_image_bin_path[0]= 0;
xorriso->patch_system_area= 0;
@ -676,7 +676,7 @@ treatment_patch:;
if(xorriso->boot_count > 0)
goto cannot_keep_or_patch;
xorriso->keep_boot_image= 0;
xorriso->patch_isolinux_image= 1;
xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 1;
xorriso->boot_image_bin_path[0]= 0;
if(strcmp(formpt, "grub") == 0) {
xorriso->patch_isolinux_image|= 2;
@ -688,7 +688,7 @@ treatment_patch:;
} else if(strcmp(treatpt, "discard")==0) {
xorriso->keep_boot_image= 0;
xorriso->patch_isolinux_image= 0;
xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 0;
xorriso->boot_image_bin_path[0]= 0;
xorriso->patch_system_area= 0;
if((xorriso->system_area_options & 0xfc ) == 0)
@ -766,7 +766,7 @@ treatment_patch:;
strcat(xorriso->boot_image_cat_path, "boot.cat");
xorriso->boot_image_load_size= 4 * 512;
xorriso->keep_boot_image= 0;
xorriso->patch_isolinux_image= 1;
xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 1;
strcpy(xorriso->boot_image_bin_form, formpt);
{ret= 1; goto ex;}
@ -790,7 +790,7 @@ treatment_patch:;
goto ex;
xorriso->keep_boot_image= 0;
if(isolinux_grub) {
xorriso->patch_isolinux_image= 1;
xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 1;
if(xorriso->boot_image_bin_path[0])
xorriso->boot_image_load_size= 4 * 512;
strcpy(xorriso->boot_image_bin_form, formpt);
@ -852,9 +852,10 @@ treatment_patch:;
} else if(strncmp(treatpt, "boot_info_table=", 16)==0) {
if(strcmp(treatpt + 16, "off") == 0)
xorriso->patch_isolinux_image= 0;
xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 0;
else if(strcmp(treatpt + 16, "on") == 0)
xorriso->patch_isolinux_image= 1 | (2 * (strcmp(treatpt, "grub") == 0));
xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) |
1 | (2 * (strcmp(treatpt, "grub") == 0));
else
was_ok= 0;