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

Lifted the ban to combine MIPS Big Endian boot with El Torito

Browse Source
This commit is contained in:
Thomas Schmitt
2010-10-12 18:31:54 +00:00
parent da5f01d95b
commit 2b7130ecdd
6 changed files with 85 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libisoburn/trunk/xorriso/opts_a_c.c
View File

@ -567,7 +567,7 @@ int Xorriso_option_boot_image(struct XorrisO *xorriso, char *form,
{
int was_ok= 1, ret, isolinux_grub= 0, count;
unsigned int u;
char *formpt, *treatpt;
char *formpt, *treatpt, eff_path[SfileadrL];
double num;
formpt= form;
@ -739,6 +739,22 @@ treatment_patch:;
xorriso->system_area_options&= ~0xfc; /* system area type 0 */
} else if(strncmp(treatpt, "mips_path=", 10) == 0) {
#ifdef Xorriso_mips_boot_file_pathS
/* >>> Check for contradicting xorriso->system_area_options */;
ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, treatpt + 10,
eff_path, 2);
if(ret <= 0)
return(ret);
ret= Xorriso_add_mips_boot_file(xorriso, eff_path, 0);
if(ret <= 0)
return(ret);
xorriso->system_area_options= 1 << 2; /* system area type 1 */
#else /* Xorriso_mips_boot_file_pathS */
ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, treatpt + 10,
xorriso->boot_image_bin_path, 2);
if(ret <= 0)
@ -749,6 +765,8 @@ treatment_patch:;
/* >>> Preliminary : this should be adjustable per boot image */
xorriso->system_area_options&= 1 << 2; /* system area type 1 */
#endif /* ! Xorriso_mips_boot_file_pathS */
} else if(strncmp(treatpt, "boot_info_table=", 16)==0) {
if(strcmp(treatpt + 16, "off") == 0)
xorriso->patch_isolinux_image= 0;