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

New -as mkisofs option -hppa-hdrversion

Browse Source
This commit is contained in:
Thomas Schmitt
2014-01-16 11:36:30 +00:00
parent d32230fd37
commit be38d186c0
5 changed files with 64 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -636,7 +636,7 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv,
"-hfsplus-block-size", "-apm-block-size", "--grub2-mbr",
"--grub2-sparc-core", "--sort-weight-list", "--sort-weight-patterns",
"-hppa-bootloader", "-hppa-cmdline", "-hppa-kernel-32", "-hppa-kernel-64",
"-hppa-ramdisk",
"-hppa-ramdisk", "-hppa-hdrversion",
""
};
static char arg2_options[][41]= {
@ -860,6 +860,7 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag)
" -hppa-kernel-64 FILE Set hppa 64-bit image name (relative to image root)",
" -hppa-bootloader FILE Set hppa boot loader file name (relative to image root)",
" -hppa-ramdisk FILE Set hppa ramdisk file name (relative to image root)",
" -hppa-hdrversion NUMBER Set hppa PALO header version to 4 or 5",
" --grub2-sparc-core FILE Set path of core file for disk label patching",
" -efi-boot-part DISKFILE|--efi-boot-image",
" Set data source for EFI System Partition",
@ -1163,7 +1164,7 @@ int Xorriso_genisofs(struct XorrisO *xorriso, char *whom,
int argc, char **argv, int flag)
{
int ret, i, j, was_path= 0, was_other_option= 0, mem_graft_points, mem;
int do_print_size= 0, fd, idx, iso_level= -1;
int do_print_size= 0, fd, idx, iso_level= -1, palohdrversion;
int was_failure= 0, fret, lower_r= 0, zero= 0;
int dir_mode= -1, file_mode= -1, count, partition_number;
int allow_dir_id_ext= -1;
@ -2425,7 +2426,10 @@ problem_handler_2:;
goto not_enough_args;
i++;
sprintf(sfe, "-as mkisofs %s %s", argpt, argv[i]);
ret= Xorriso_coordinate_system_area(xorriso, 4, 0, sfe, 0);
palohdrversion= (xorriso->system_area_options >> 2) & 0x3f;
if(palohdrversion != 4)
palohdrversion= 5;
ret= Xorriso_coordinate_system_area(xorriso, palohdrversion, 0, sfe, 0);
if(ret <= 0)
goto ex;
ret= Xorriso_set_hppa_boot_parm(xorriso, argv[i], argpt + 6, 0);