From 49ba26d6b0989e147989eb1514e9a3ecb56d8ebc Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 14 Jan 2014 09:11:02 +0000 Subject: [PATCH] New -boot_image settings hppa_cmdline=, hppa_bootloader=, hppa_kernel_32=, hppa_kernel_64=, hppa_ramdisk= --- xorriso/iso_img.c | 109 +++++++++++++++++++++--- xorriso/opts_a_c.c | 29 ++++++- xorriso/opts_d_h.c | 4 +- xorriso/write_run.c | 2 +- xorriso/xorriso.1 | 30 +++++-- xorriso/xorriso.info | 165 +++++++++++++++++++----------------- xorriso/xorriso.texi | 33 ++++++-- xorriso/xorriso_private.h | 1 + xorriso/xorriso_timestamp.h | 2 +- xorriso/xorrisoburn.h | 3 + 10 files changed, 263 insertions(+), 115 deletions(-) diff --git a/xorriso/iso_img.c b/xorriso/iso_img.c index 5a0c3c19..204e088b 100644 --- a/xorriso/iso_img.c +++ b/xorriso/iso_img.c @@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2013 Thomas Schmitt, + Copyright 2007-2014 Thomas Schmitt, Provided under GPL version 2 or later. @@ -515,6 +515,22 @@ ex:; } +int Xorriso_status_hppa(struct XorrisO *xorriso, char *what, char *value, + char *filter, FILE *fp, int flag) +{ + char *line; + + line= xorriso->result_line; + if(value == NULL) + return(1); + sprintf(line, "-boot_image any hppa_%s=", what); + Text_shellsafe(value, line, 1); + strcat(line, "\n"); + Xorriso_status_result(xorriso, filter, fp, flag & 2); + return(1); +} + + /* bit0= do only report non-default settings bit1= do only report to fp @@ -522,8 +538,9 @@ ex:; int Xorriso_boot_status_non_mbr(struct XorrisO *xorriso, IsoImage *image, char *filter, FILE *fp, int flag) { - int i, num_boots, sa_type; + int i, num_boots, sa_type, ret; char *paths[15], *line; + char *cmdline, *bootloader, *kernel_32, *kernel_64, *ramdisk; line= xorriso->result_line; @@ -539,21 +556,37 @@ int Xorriso_boot_status_non_mbr(struct XorrisO *xorriso, IsoImage *image, Xorriso_status_result(xorriso, filter, fp, flag & 2); return(0); } - if(sa_type != 1 && sa_type != 2) + if(sa_type != 1 && sa_type != 2 && sa_type != 4) return(0); - num_boots= iso_image_get_mips_boot_files(image, paths, 0); - Xorriso_process_msg_queues(xorriso, 0); - if(num_boots <= 0) + + if(sa_type == 1 || sa_type == 2) { + num_boots= iso_image_get_mips_boot_files(image, paths, 0); + Xorriso_process_msg_queues(xorriso, 0); + if(num_boots > 0) { + if(sa_type == 2) + num_boots= 1; + for(i= 0; i < num_boots; i++) { + sprintf(line, "-boot_image any mips%s_path=", sa_type ==2 ? "el" : ""); + Text_shellsafe(paths[i], line, 1); + strcat(line, "\n"); + Xorriso_status_result(xorriso, filter, fp, flag & 2); + } + } return(num_boots); - if(sa_type == 2) - num_boots= 1; - for(i= 0; i < num_boots; i++) { - sprintf(line, "-boot_image any mips%s_path=", sa_type ==2 ? "el" : ""); - Text_shellsafe(paths[i], line, 1); - strcat(line, "\n"); - Xorriso_status_result(xorriso, filter, fp, flag & 2); } - return(num_boots); + if(sa_type == 4) { + ret= iso_image_get_hppa_palo(image, &cmdline, &bootloader, &kernel_32, + &kernel_64, &ramdisk); + if(ret == 1) { + Xorriso_status_hppa(xorriso, "cmdline", cmdline, filter, fp, 0); + Xorriso_status_hppa(xorriso, "bootloader", bootloader, filter, fp, 0); + Xorriso_status_hppa(xorriso, "kernel_32", kernel_32, filter, fp, 0); + Xorriso_status_hppa(xorriso, "kernel_64", kernel_64, filter, fp, 0); + Xorriso_status_hppa(xorriso, "ramdisk", ramdisk, filter, fp, 0); + } + return(0); + } + return(0); } @@ -1226,6 +1259,54 @@ report_error:; } +/* @param flag bit0= Give up HP-PA boot parameters +*/ +int Xorriso_set_hppa_boot_parm(struct XorrisO *xorriso, char *text, char *what, + int flag) +{ + int ret; + IsoImage *image; + char *par[5]; + + ret= Xorriso_get_volume(xorriso, &image, 0); + if(ret <= 0) + return(ret); + par[0]= par[1]= par[2]= par[3]= par[4]= NULL; + if(flag & 1) { + /* Give up HP-PA boot parameters */ + iso_image_set_hppa_palo(image, par[0], par[1], par[2], par[3], par[4], + 1); + return(1); + } + if(strcmp(what, "cmdline") == 0) { + par[0]= text; + } else if(strcmp(what, "bootloader") == 0) { + par[1]= text; + } else if(strcmp(what, "kernel_32") == 0 || strcmp(what, "kernel-32") == 0) { + par[2]= text; + } else if(strcmp(what, "kernel_64") == 0 || strcmp(what, "kernel-64") == 0) { + par[3]= text; + } else if(strcmp(what, "ramdisk") == 0) { + par[4]= text; + } else { + strcpy(xorriso->info_text, + "HP-PA boot parameter name not recognized: hppa_"); + Text_shellsafe(what, xorriso->info_text, 1); + Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); + return(0); + } + ret= iso_image_set_hppa_palo(image, par[0], par[1], par[2], par[3], par[4], + 0); + if (ret < 0) { + Xorriso_report_iso_error(xorriso, "", ret, + "Error when adding HP-PA boot parameter", + 0, "FAILURE", 1); + return(0); + } + return(1); +} + + int Xorriso_coordinate_system_area(struct XorrisO *xorriso, int sa_type, int options, char *cmd, int flag) { diff --git a/xorriso/opts_a_c.c b/xorriso/opts_a_c.c index 43df978b..60b79807 100644 --- a/xorriso/opts_a_c.c +++ b/xorriso/opts_a_c.c @@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2013 Thomas Schmitt, + Copyright 2007-2014 Thomas Schmitt, Provided under GPL version 2 or later. @@ -667,9 +667,9 @@ unusable_size:; int Xorriso_option_boot_image(struct XorrisO *xorriso, char *form, char *treatment, int flag) { - int was_ok= 1, ret, isolinux_grub= 0, count, bin_count; + int was_ok= 1, ret, isolinux_grub= 0, count, bin_count, parm_len; unsigned int u; - char *formpt, *treatpt, *eff_path= NULL; + char *formpt, *treatpt, *eff_path= NULL, *eqpt, parm[20]; uint8_t sn[8]; double num; @@ -864,9 +864,11 @@ treatment_patch:; } else if(strcmp(treatpt, "mips_discard") == 0 || strcmp(treatpt, "mipsel_discard") == 0 || - strcmp(treatpt, "sparc_discard") == 0) { + strcmp(treatpt, "sparc_discard") == 0 || + strcmp(treatpt, "hppa_discard") == 0) { xorriso->system_area_options&= ~0xfc; /* system area type 0 */ Xorriso_add_mips_boot_file(xorriso, "", 1); /* give up MIPS boot files */ + Xorriso_set_hppa_boot_parm(xorriso, "", "", 1); /* give up HP-PA files */ } else if(strncmp(treatpt, "sparc_label=", 12) == 0) { sprintf(eff_path, "-boot_image %s sparc_label=", formpt); @@ -883,6 +885,25 @@ treatment_patch:; if(ret <= 0) goto ex; + } else if(strncmp(treatpt, "hppa_", 5) == 0) { + sprintf(eff_path, "-boot_image %s %s", formpt, treatpt); + ret= Xorriso_coordinate_system_area(xorriso, 4, 0, eff_path, 0); + if(ret <= 0) + goto ex; + eqpt= strchr(treatpt, '='); + if(eqpt == NULL) { + sprintf(xorriso->info_text, + "No equal sign found in -boot_image %s %s", form, treatment); + Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); + ret= 0; goto ex; + } + parm_len= (eqpt - treatpt) - 5; + if(parm_len > (int) sizeof(parm) - 1) + parm_len= sizeof(parm) - 1; + strncpy(parm, treatpt + 5, parm_len); + parm[parm_len]= 0; + ret= Xorriso_set_hppa_boot_parm(xorriso, eqpt + 1, parm, 0); + } else if(strncmp(treatpt, "boot_info_table=", 16)==0) { if(strcmp(treatpt + 16, "off") == 0) xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 0; diff --git a/xorriso/opts_d_h.c b/xorriso/opts_d_h.c index 0d0a211a..aa5a3e64 100644 --- a/xorriso/opts_d_h.c +++ b/xorriso/opts_d_h.c @@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2013 Thomas Schmitt, + Copyright 2007-2014 Thomas Schmitt, Provided under GPL version 2 or later. @@ -1684,6 +1684,8 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) " |\"efi_boot_part=\"|\"efi_boot_part=--efi-boot-image\"", " |\"mips_path=\"|\"mipsel_path=\"|\"mips_discard\"", " |\"sparc_label=\"|\"grub2_sparc_core=\"|\"sparc_discard\"", +" |\"hppa_cmdline=\"|\"hppa_bootloader=\"|\"hppa_kernel_32\"", +" |\"hppa_kernel_64=\"|\"hppa_ramdisk=\"", " |\"hfsplus_serial=\"|\"hfsplus_block_size=\"", " |\"apm_block_size=\"|\"show_status\"", " Whether to discard or keep an exiting El Torito boot image.", diff --git a/xorriso/write_run.c b/xorriso/write_run.c index 3d1acd94..0622a7b3 100644 --- a/xorriso/write_run.c +++ b/xorriso/write_run.c @@ -2,7 +2,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2013 Thomas Schmitt, + Copyright 2007-2014 Thomas Schmitt, Provided under GPL version 2 or later. diff --git a/xorriso/xorriso.1 b/xorriso/xorriso.1 index bec66fc1..7396170c 100644 --- a/xorriso/xorriso.1 +++ b/xorriso/xorriso.1 @@ -9,7 +9,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH XORRISO 1 "Version 1.3.5, Jan 02, 2014" +.TH XORRISO 1 "Version 1.3.5, Jan 14, 2014" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -425,7 +425,7 @@ MBR, GPT and APM are combinable. APM occupies the first 8 bytes of MBR boot code. All three do not hamper El Torito booting from CDROM. .br There is support for further facilities: -MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC. +MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC, HP\-PA. Those are mutually not combinable and also not combinable with MBR, GPT, or APM. .br @@ -2888,7 +2888,7 @@ can assume overwriteable media. There are booting mechanisms which do not use an El Torito record but rather start at the first bytes of the image: PC\-BIOS MBR for hard\-disk\-like devices, MIPS Volume Header for old SGI computers, DEC Boot Block for old DECstation, -SUN Disk Label for SPARC machines. +SUN Disk Label for SPARC machines, HP\-PA boot sector for HP PA\-RISC machines. .br The boot firmware EFI may use programs which are located in a FAT filesystem and announced by an MBR partition table entry. @@ -3144,10 +3144,24 @@ of the given file to be written after the SUN Disk Label. Both numbers are counted in bytes. The address is written as 64 bit big\-endian number to byte 0x228. The size is written as 32 bit big\-endian number to byte 0x230. .br -\fBmips_discard\fR and \fBsparc_discard\fR revoke any boot file -declarations made by mips_path= or mipsel_path=. They also disable production -of SUN Disk Label. -This removes the ban on production of other boot blocks. +\fBhppa_cmdline=\fRtext sets the PALO command line for HP\-PA. Up to 127 +characters are permitted. +.br +\fBhppa_bootloader=\fRiso_rr_path designates the given path as HP\-PA +bootloader file. +.br +\fBhppa_kernel_32=\fRiso_rr_path designates the given path as HP\-PA +32 bit kernel file. +.br +\fBhppa_kernel_64=\fRiso_rr_path designates the given path as HP\-PA +64 bit kernel file. +.br +\fBhppa_ramdisk=\fRiso_rr_path designates the given path as HP\-PA +RAM disk file. +.br +\fBmips_discard\fR, \fBsparc_discard\fR, and \fBhppa_discard\fR +revoke any boot file declarations made for mips or mipsel, resp. sparc, +resp. hppa. This removes the ban on production of other boot blocks. .br \fBhfsplus_serial=\fRhexstring sets a string of 16 digits "0" to "9" and letters "a" to "f", which will be used as unique serial number of @@ -5532,7 +5546,7 @@ Thomas Schmitt .br for libburnia\-project.org .SH COPYRIGHT -Copyright (c) 2007 \- 2013 Thomas Schmitt +Copyright (c) 2007 \- 2014 Thomas Schmitt .br Permission is granted to distribute this text freely. It shall only be modified in sync with the technical properties of \fBxorriso\fR. diff --git a/xorriso/xorriso.info b/xorriso/xorriso.info index ecbc82b5..5f257a1f 100644 --- a/xorriso/xorriso.info +++ b/xorriso/xorriso.info @@ -8,7 +8,7 @@ END-INFO-DIR-ENTRY xorriso - creates, loads, manipulates and writes ISO 9660 filesystem images with Rock Ridge extensions. - Copyright (C) 2007 - 2013 Thomas Schmitt + Copyright (C) 2007 - 2014 Thomas Schmitt Permission is granted to distrubute this text freely. @@ -371,8 +371,8 @@ Macs for booting and for mounting. MBR, GPT and APM are combinable. APM occupies the first 8 bytes of MBR boot code. All three do not hamper El Torito booting from CDROM. There is support for further facilities: MIPS Big Endian (SGI), MIPS -Little Endian (DEC), SUN SPARC. Those are mutually not combinable and -also not combinable with MBR, GPT, or APM. +Little Endian (DEC), SUN SPARC, HP-PA. Those are mutually not +combinable and also not combinable with MBR, GPT, or APM. *ACL* are an advanced way of controlling access permissions to file objects. Neither ISO 9660 nor Rock Ridge specify a way to record ACLs. @@ -2551,7 +2551,8 @@ of the existing sessions, unless one can assume overwriteable media. There are booting mechanisms which do not use an El Torito record but rather start at the first bytes of the image: PC-BIOS MBR for hard-disk-like devices, MIPS Volume Header for old SGI computers, DEC -Boot Block for old DECstation, SUN Disk Label for SPARC machines. +Boot Block for old DECstation, SUN Disk Label for SPARC machines, HP-PA +boot sector for HP PA-RISC machines. The boot firmware EFI may use programs which are located in a FAT filesystem and announced by an MBR partition table entry. @@ -2760,10 +2761,19 @@ filesystem and announced by an MBR partition table entry. numbers are counted in bytes. The address is written as 64 bit big-endian number to byte 0x228. The size is written as 32 bit big-endian number to byte 0x230. - *mips_discard* and *sparc_discard* revoke any boot file - declarations made by mips_path= or mipsel_path=. They also disable - production of SUN Disk Label. This removes the ban on production - of other boot blocks. + *hppa_cmdline=*text sets the PALO command line for HP-PA. Up to 127 + characters are permitted. + *hppa_bootloader=*iso_rr_path designates the given path as HP-PA + bootloader file. + *hppa_kernel_32=*iso_rr_path designates the given path as HP-PA 32 + bit kernel file. + *hppa_kernel_64=*iso_rr_path designates the given path as HP-PA 64 + bit kernel file. + *hppa_ramdisk=*iso_rr_path designates the given path as HP-PA RAM + disk file. + *mips_discard*, *sparc_discard*, and *hppa_discard* revoke any + boot file declarations made for mips or mipsel, resp. sparc, resp. + hppa. This removes the ban on production of other boot blocks. *hfsplus_serial=*hexstring sets a string of 16 digits "0" to "9" and letters "a" to "f", which will be used as unique serial number of an emerging HFS+ filesystem. @@ -4863,7 +4873,7 @@ for libburnia-project.org 14.2 Copyright ============== -Copyright (c) 2007 - 2013 Thomas Schmitt +Copyright (c) 2007 - 2014 Thomas Schmitt Permission is granted to distribute this text freely. It shall only be modified in sync with the technical properties of `xorriso'. If you make use of the license to derive modified versions of `xorriso' then @@ -4898,7 +4908,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -alter_date sets timestamps in ISO image: Manip. (line 154) * -alter_date_r sets timestamps in ISO image: Manip. (line 187) * -append_partition adds arbitrary file after image end: Bootable. - (line 249) + (line 259) * -application_id sets application id: SetWrite. (line 196) * -application_use sets application use field: SetWrite. (line 262) * -as emulates mkisofs or cdrecord: Emulation. (line 13) @@ -4908,7 +4918,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -ban_stdio_write demands real drive: Loading. (line 278) * -biblio_file sets biblio file name: SetWrite. (line 244) * -blank erases media: Writing. (line 61) -* -boot_image controls bootability: Bootable. (line 26) +* -boot_image controls bootability: Bootable. (line 27) * -calm_drive reduces drive activity: Loading. (line 267) * -cd sets working directory in ISO: Navigate. (line 7) * -cdx sets working directory on disk: Navigate. (line 16) @@ -5133,10 +5143,10 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * ACL, set in ISO image, -setfacl_r: Manip. (line 105) * ACL, show in ISO image, -getfacl: Navigate. (line 70) * ACL, show in ISO image, -getfacl_r: Navigate. (line 77) -* APM block size: Bootable. (line 240) +* APM block size: Bootable. (line 250) * APM, _definition: Extras. (line 41) * Appendable media, _definition: Media. (line 38) -* Appended Filesystem Image, -append_partition: Bootable. (line 249) +* Appended Filesystem Image, -append_partition: Bootable. (line 259) * Automatic execution order, of arguments, -x: ArgSort. (line 16) * Backslash Interpretation, _definition: Processing. (line 52) * Backup, enable fast incremental, -disk_dev_ino: Loading. (line 217) @@ -5144,7 +5154,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 177) * Blank media, _definition: Media. (line 29) * Blind growing, _definition: Methods. (line 40) -* Bootability, control, -boot_image: Bootable. (line 26) +* Bootability, control, -boot_image: Bootable. (line 27) * Bugs, reporting: Bugreport. (line 6) * cdrecord, Emulation: Emulation. (line 116) * Character Set, _definition: Charset. (line 6) @@ -5153,13 +5163,13 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Character Set, for output, -out_charset: SetWrite. (line 276) * Character set, learn from image, -auto_charset: Loading. (line 122) * Character Set, of terminal, -local_charset: Charset. (line 58) -* CHRP partition, _definition: Bootable. (line 158) +* CHRP partition, _definition: Bootable. (line 159) * Closed media, _definition: Media. (line 43) * Comment, #: Scripting. (line 173) * Control, signal handling, -signal_handling: Exception. (line 69) * Create, new ISO image, _definition: Methods. (line 6) -* Cylinder alignment, _definition: Bootable. (line 198) -* Cylinder size, _definition: Bootable. (line 187) +* Cylinder alignment, _definition: Bootable. (line 199) +* Cylinder size, _definition: Bootable. (line 188) * Damaged track and session, close, -close_damaged: Writing. (line 170) * Delete, from ISO image, -rm: Manip. (line 21) * Delete, from ISO image, -rm_r: Manip. (line 28) @@ -5191,7 +5201,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Drive, write and eject, -commit_eject: Writing. (line 56) * EA, _definition: Extras. (line 65) * ECMA-119, _definition: Model. (line 6) -* EFI system partition, _definition: Bootable. (line 167) +* EFI system partition, _definition: Bootable. (line 168) * El Torito, _definition: Extras. (line 19) * Emulation, -as: Emulation. (line 13) * Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 151) @@ -5217,9 +5227,10 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Group, in ISO image, -chgrp_r: Manip. (line 62) * Growing, _definition: Methods. (line 19) * Hard links, control handling, -hardlinks: Loading. (line 134) -* HFS+ allocation block size: Bootable. (line 237) -* HFS+ serial number: Bootable. (line 234) +* HFS+ allocation block size: Bootable. (line 247) +* HFS+ serial number: Bootable. (line 244) * hidden, set in ISO image, -hide: Manip. (line 191) +* HP-PA boot sector, production: Bootable. (line 231) * Image reading, cache size, -data_cache_size: Loading. (line 296) * Image, _definition: Model. (line 9) * Image, demand volume ID, -assert_volid: Loading. (line 108) @@ -5269,13 +5280,13 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * List delimiter, _definition: Processing. (line 9) * Local Character Set, _definition: Charset. (line 11) * MBR, _definition: Extras. (line 26) -* MBR, set, -boot_image system_area=: Bootable. (line 126) +* MBR, set, -boot_image system_area=: Bootable. (line 127) * MD5, control handling, -md5: Loading. (line 183) * Media, erase, -blank: Writing. (line 61) * Media, format, -format: Writing. (line 91) * Media, list formats, -list_formats: Writing. (line 134) * Media, list write speeds, -list_speeds: Writing. (line 146) -* MIPS boot file, activation: Bootable. (line 209) +* MIPS boot file, activation: Bootable. (line 210) * mkisofs, Emulation: Emulation. (line 16) * Modifying, _definition: Methods. (line 27) * Multi-session media, _definition: Media. (line 7) @@ -5302,15 +5313,15 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Ownership, global in ISO image, -uid: SetWrite. (line 282) * Ownership, in ISO image, -chown: Manip. (line 49) * Ownership, in ISO image, -chown_r: Manip. (line 54) -* Partition offset, _definition: Bootable. (line 177) -* Partition table, _definition: Bootable. (line 138) +* Partition offset, _definition: Bootable. (line 178) +* Partition table, _definition: Bootable. (line 139) * Pathspec, _definition: SetInsert. (line 120) * Pattern expansion, _definition: Processing. (line 24) * Pattern expansion, for disk paths, -disk_pattern: Insert. (line 36) * Pattern expansion, for ISO paths, -iso_rr_pattern: Manip. (line 10) * Permissions, in ISO image, -chmod: Manip. (line 65) * Permissions, in ISO image, -chmod_r: Manip. (line 77) -* PReP partition, _definition: Bootable. (line 162) +* PReP partition, _definition: Bootable. (line 163) * Problems, reporting: Bugreport. (line 6) * Process, consolidate text output, -pkt_output: Frontend. (line 7) * Process, control abort on error, -abort_on: Exception. (line 27) @@ -5369,10 +5380,10 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Session, mount parameters, -mount_opts: Inquiry. (line 68) * Session, select as input, -load: Loading. (line 35) * Sorting order, for -x, -list_arg_sorting: ArgSort. (line 27) -* SUN Disk Label, production: Bootable. (line 220) -* SUN SPARC boot images, activation: Bootable. (line 270) +* SUN Disk Label, production: Bootable. (line 221) +* SUN SPARC boot images, activation: Bootable. (line 280) * Symbolic link, create, -lns: Insert. (line 176) -* System area, _definition: Bootable. (line 126) +* System area, _definition: Bootable. (line 127) * Table-of-content, search sessions, -rom_toc_scan: Loading. (line 238) * Table-of-content, show, -toc: Inquiry. (line 28) * Timestamps, set in ISO image, -alter_date: Manip. (line 154) @@ -5388,7 +5399,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Verify, file tree checksums, -check_md5_r: Verify. (line 170) * Verify, preset -check_media, -check_media_defaults: Verify. (line 41) * Write, block size, -dvd_obs: SetWrite. (line 333) -* Write, bootability, -boot_image: Bootable. (line 26) +* Write, bootability, -boot_image: Bootable. (line 27) * Write, buffer syncing, -stdio_sync: SetWrite. (line 340) * Write, close media, -close: SetWrite. (line 357) * Write, compliance to specs, -compliance: SetWrite. (line 58) @@ -5424,53 +5435,53 @@ Node: Media6311 Node: Methods8982 Node: Drives11557 Node: Extras15072 -Node: Processing19524 -Node: Dialog23144 -Node: Commands24822 -Node: ArgSort26499 -Node: AqDrive27991 -Node: Loading31036 -Node: Insert47965 -Node: SetInsert58179 -Node: Manip66756 -Node: CmdFind76536 -Node: Filter93137 -Node: Writing97693 -Node: SetWrite107824 -Node: Bootable128409 -Node: Jigdo144799 -Node: Charset149046 -Node: Exception152361 -Node: DialogCtl158481 -Node: Inquiry161079 -Node: Navigate167396 -Node: Verify175694 -Node: Restore184726 -Node: Emulation191813 -Node: Scripting202115 -Node: Frontend209886 -Node: Examples219493 -Node: ExDevices220671 -Node: ExCreate221330 -Node: ExDialog222615 -Node: ExGrowing223880 -Node: ExModifying224685 -Node: ExBootable225189 -Node: ExCharset225741 -Node: ExPseudo226633 -Node: ExCdrecord227531 -Node: ExMkisofs227848 -Node: ExGrowisofs229188 -Node: ExException230323 -Node: ExTime230777 -Node: ExIncBackup231236 -Node: ExRestore235216 -Node: ExRecovery236149 -Node: Files236719 -Node: Seealso238018 -Node: Bugreport238741 -Node: Legal239322 -Node: CommandIdx240333 -Node: ConceptIdx256995 +Node: Processing19531 +Node: Dialog23151 +Node: Commands24829 +Node: ArgSort26506 +Node: AqDrive27998 +Node: Loading31043 +Node: Insert47972 +Node: SetInsert58186 +Node: Manip66763 +Node: CmdFind76543 +Node: Filter93144 +Node: Writing97700 +Node: SetWrite107831 +Node: Bootable128416 +Node: Jigdo145297 +Node: Charset149544 +Node: Exception152859 +Node: DialogCtl158979 +Node: Inquiry161577 +Node: Navigate167894 +Node: Verify176192 +Node: Restore185224 +Node: Emulation192311 +Node: Scripting202613 +Node: Frontend210384 +Node: Examples219991 +Node: ExDevices221169 +Node: ExCreate221828 +Node: ExDialog223113 +Node: ExGrowing224378 +Node: ExModifying225183 +Node: ExBootable225687 +Node: ExCharset226239 +Node: ExPseudo227131 +Node: ExCdrecord228029 +Node: ExMkisofs228346 +Node: ExGrowisofs229686 +Node: ExException230821 +Node: ExTime231275 +Node: ExIncBackup231734 +Node: ExRestore235714 +Node: ExRecovery236647 +Node: Files237217 +Node: Seealso238516 +Node: Bugreport239239 +Node: Legal239820 +Node: CommandIdx240831 +Node: ConceptIdx257493  End Tag Table diff --git a/xorriso/xorriso.texi b/xorriso/xorriso.texi index 27fb406e..863d4694 100644 --- a/xorriso/xorriso.texi +++ b/xorriso/xorriso.texi @@ -50,7 +50,7 @@ @c man .\" First parameter, NAME, should be all caps @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @c man .\" other parameters are allowed: see man(7), man(1) -@c man .TH XORRISO 1 "Version 1.3.5, Jan 02, 2014" +@c man .TH XORRISO 1 "Version 1.3.5, Jan 14, 2014" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -69,7 +69,7 @@ xorriso - creates, loads, manipulates and writes ISO 9660 filesystem images with Rock Ridge extensions. -Copyright @copyright{} 2007 - 2013 Thomas Schmitt +Copyright @copyright{} 2007 - 2014 Thomas Schmitt @quotation Permission is granted to distrubute this text freely. @@ -567,7 +567,7 @@ MBR, GPT and APM are combinable. APM occupies the first 8 bytes of MBR boot code. All three do not hamper El Torito booting from CDROM. @* There is support for further facilities: -MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC. +MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC, HP-PA. Those are mutually not combinable and also not combinable with MBR, GPT, or APM. @* @@ -3401,7 +3401,7 @@ can assume overwriteable media. There are booting mechanisms which do not use an El Torito record but rather start at the first bytes of the image: PC-BIOS MBR for hard-disk-like devices, MIPS Volume Header for old SGI computers, DEC Boot Block for old DECstation, -SUN Disk Label for SPARC machines. +SUN Disk Label for SPARC machines, HP-PA boot sector for HP PA-RISC machines. @* The boot firmware EFI may use programs which are located in a FAT filesystem and announced by an MBR partition table entry. @@ -3676,10 +3676,25 @@ of the given file to be written after the SUN Disk Label. Both numbers are counted in bytes. The address is written as 64 bit big-endian number to byte 0x228. The size is written as 32 bit big-endian number to byte 0x230. @* -@strong{mips_discard} and @strong{sparc_discard} revoke any boot file -declarations made by mips_path= or mipsel_path=. They also disable production -of SUN Disk Label. -This removes the ban on production of other boot blocks. +@cindex HP-PA boot sector, production +@strong{hppa_cmdline=}text sets the PALO command line for HP-PA. Up to 127 +characters are permitted. +@* +@strong{hppa_bootloader=}iso_rr_path designates the given path as HP-PA +bootloader file. +@* +@strong{hppa_kernel_32=}iso_rr_path designates the given path as HP-PA +32 bit kernel file. +@* +@strong{hppa_kernel_64=}iso_rr_path designates the given path as HP-PA +64 bit kernel file. +@* +@strong{hppa_ramdisk=}iso_rr_path designates the given path as HP-PA +RAM disk file. +@* +@strong{mips_discard}, @strong{sparc_discard}, and @strong{hppa_discard} +revoke any boot file declarations made for mips or mipsel, resp. sparc, +resp. hppa. This removes the ban on production of other boot blocks. @* @cindex HFS+ serial number @strong{hfsplus_serial=}hexstring sets a string of 16 digits "0" to "9" @@ -6543,7 +6558,7 @@ Thomas Schmitt for libburnia-project.org @c man .SH COPYRIGHT @section Copyright -Copyright (c) 2007 - 2013 Thomas Schmitt +Copyright (c) 2007 - 2014 Thomas Schmitt @* Permission is granted to distribute this text freely. It shall only be modified in sync with the technical properties of @command{xorriso}. diff --git a/xorriso/xorriso_private.h b/xorriso/xorriso_private.h index 4a6b4edd..3d06a58e 100644 --- a/xorriso/xorriso_private.h +++ b/xorriso/xorriso_private.h @@ -403,6 +403,7 @@ struct XorrisO { /* the global context of xorriso */ 1= MIPS Big Endian Volume Header 2= MIPS Little Endian Boot Block 3= SUN Disk Label for SUN SPARC + 4= HP-PA PALO boot sector bit8-9= Only with System area type 0 Cylinder alignment mode 0 = auto (align if bit1) diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 997798de..2f72f5ee 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2014.01.14.084808" +#define Xorriso_timestamP "2014.01.14.090320" diff --git a/xorriso/xorrisoburn.h b/xorriso/xorrisoburn.h index a71f934f..a7d759c0 100644 --- a/xorriso/xorrisoburn.h +++ b/xorriso/xorrisoburn.h @@ -540,6 +540,9 @@ int Xorriso_boot_image_status(struct XorrisO *xorriso, char *filter, FILE *fp, int Xorriso_add_mips_boot_file(struct XorrisO *xorriso, char *path, int flag); +int Xorriso_set_hppa_boot_parm(struct XorrisO *xorriso, char *text, char *what, + int flag); + int Xorriso_coordinate_system_area(struct XorrisO *xorriso, int sa_type, int options, char *cmd, int flag);