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

24
libisoburn/trunk/xorriso/emulators.c
View File

@ -1455,7 +1455,9 @@ problem_handler_2:;
xorriso->patch_isolinux_image= 1;
} else if(strcmp(argv[i], "-b") == 0 ||
strcmp(argv[i], "-eltorito-boot") == 0 ||
#ifndef Xorriso_mips_boot_file_pathS
strcmp(argv[i], "-mips-boot") == 0 ||
#endif
strcmp(argv[i], "--efi-boot") == 0 ||
strcmp(argv[i], "-e") == 0) {
i++;
@ -1469,6 +1471,9 @@ problem_handler_2:;
boot_path= xorriso->boot_image_bin_path;
xorriso->boot_efi_default= 1;
emul_boot= xorriso->boot_image_emul= 0;
#ifndef Xorriso_mips_boot_file_pathS
} else if(strcmp(argv[i - 1], "-mips-boot") == 0) {
boot_path= xorriso->boot_image_bin_path;
option_b= 0;
@ -1476,6 +1481,7 @@ problem_handler_2:;
/* >>> 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 {
boot_path= xorriso->boot_image_bin_path;
@ -1559,6 +1565,24 @@ problem_handler_2:;
ret= Xorriso_option_boot_image(xorriso, "any", sfe, 0);
if(ret <= 0)
goto problem_handler_boot;
#ifdef Xorriso_mips_boot_file_pathS
} else if(strcmp(argv[i], "-mips-boot")==0) {
if(i+1>=argc)
goto not_enough_args;
i++;
strcpy(sfe, "mips_path=");
ret= Sfile_str(sfe, argv[i], 1);
if(ret <= 0)
goto ex;
ret = Xorriso_option_boot_image(xorriso, "any", sfe, 0);
if(ret <= 0)
goto problem_handler_boot;
#endif /* Xorriso_mips_boot_file_pathS */
}
continue; /* regular bottom of loop */
problem_handler_boot:;