diff --git a/xorriso/emulators.c b/xorriso/emulators.c index 0dfeaa76..c5f0c460 100644 --- a/xorriso/emulators.c +++ b/xorriso/emulators.c @@ -635,8 +635,7 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv, "-rr_reloc_dir", "-hfsplus-serial-no", "-prep-boot-part", "-efi-boot-part", "-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-hdrversion", + "-hppa-hdrversion", "" }; static char arg2_options[][41]= { @@ -855,12 +854,18 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag) " -mipsel-boot FILE Set mipsel boot image name (relative to image root)", " -B FILES, -sparc-boot FILES Set sparc boot image names", " -sparc-label label text Set sparc boot disk label", + +#ifdef Libisofs_enable_unreleased_hppa_palO + " -hppa-cmdline CMDLINE Set hppa boot command line", " -hppa-kernel-32 FILE Set hppa 32-bit image name (relative to image root)", " -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", + +#endif /* Libisofs_enable_unreleased_hppa_palO */ + " --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", diff --git a/xorriso/iso_img.c b/xorriso/iso_img.c index 9c96453f..4ccb681a 100644 --- a/xorriso/iso_img.c +++ b/xorriso/iso_img.c @@ -554,10 +554,17 @@ int Xorriso_status_hppa(struct XorrisO *xorriso, char *what, char *value, int Xorriso_boot_status_non_mbr(struct XorrisO *xorriso, IsoImage *image, char *filter, FILE *fp, int flag) { - int i, num_boots, sa_type, ret; - char *paths[15], *line, num[4]; + int i, num_boots, sa_type; + char *paths[15], *line; + +#ifdef Libisofs_enable_unreleased_hppa_palO + + int ret; + char num[4]; char *cmdline, *bootloader, *kernel_32, *kernel_64, *ramdisk; +#endif + line= xorriso->result_line; sa_type= (xorriso->system_area_options & 0xfc) >> 2; @@ -591,6 +598,9 @@ int Xorriso_boot_status_non_mbr(struct XorrisO *xorriso, IsoImage *image, return(num_boots); } if(sa_type == 4 || sa_type == 5) { + +#ifdef Libisofs_enable_unreleased_hppa_palO + ret= iso_image_get_hppa_palo(image, &cmdline, &bootloader, &kernel_32, &kernel_64, &ramdisk); if(ret == 1) { @@ -602,6 +612,9 @@ int Xorriso_boot_status_non_mbr(struct XorrisO *xorriso, IsoImage *image, sprintf(num, "%d", sa_type); Xorriso_status_hppa(xorriso, "hdrversion", num, filter, fp, 0); } + +#endif /* ! Libisofs_enable_unreleased_hppa_palO */ + return(0); } return(0); @@ -1289,8 +1302,14 @@ int Xorriso_set_hppa_boot_parm(struct XorrisO *xorriso, char *text, char *what, par[0]= par[1]= par[2]= par[3]= par[4]= NULL; if(flag & 1) { /* Give up HP-PA boot parameters */ + +#ifdef Libisofs_enable_unreleased_hppa_palO + iso_image_set_hppa_palo(image, par[0], par[1], par[2], par[3], par[4], 1); + +#endif + return(1); } if(strcmp(what, "cmdline") == 0) { @@ -1324,6 +1343,9 @@ int Xorriso_set_hppa_boot_parm(struct XorrisO *xorriso, char *text, char *what, Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); return(0); } + +#ifdef Libisofs_enable_unreleased_hppa_palO + ret= iso_image_set_hppa_palo(image, par[0], par[1], par[2], par[3], par[4], 0); if (ret < 0) { @@ -1333,6 +1355,15 @@ int Xorriso_set_hppa_boot_parm(struct XorrisO *xorriso, char *text, char *what, return(0); } return(1); + +#else + + strcpy(xorriso->info_text, "HP-PA boot preparations are not yet supported"); + Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); + return(0); + +#endif /* ! Libisofs_enable_unreleased_hppa_palO */ + } diff --git a/xorriso/opts_d_h.c b/xorriso/opts_d_h.c index aa5a3e64..98fa1432 100644 --- a/xorriso/opts_d_h.c +++ b/xorriso/opts_d_h.c @@ -1684,8 +1684,14 @@ 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\"", + +#ifdef Libisofs_enable_unreleased_hppa_palO + " |\"hppa_cmdline=\"|\"hppa_bootloader=\"|\"hppa_kernel_32\"", -" |\"hppa_kernel_64=\"|\"hppa_ramdisk=\"", +" |\"hppa_kernel_64=\"|\"hppa_ramdisk=\"|\"hppa_hdrversion\"", + +#endif + " |\"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/xorriso.1 b/xorriso/xorriso.1 index c5e9cf11..9d6e3d3a 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 20, 2014" +.TH XORRISO 1 "Version 1.3.5, Mar 03, 2014" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -308,6 +308,10 @@ On FreeBSD the device files have names like .br \-dev /dev/cd0 .br +On NetBSD: +.br + \-dev /dev/rcd0d +.br On OpenSolaris: .br \-dev /dev/rdsk/c4t0d0s2 @@ -425,7 +429,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, HP\-PA. +MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC. Those are mutually not combinable and also not combinable with MBR, GPT, or APM. .br @@ -2888,7 +2892,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, HP\-PA boot sector for HP PA\-RISC machines. +SUN Disk Label for SPARC 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,31 +3148,9 @@ 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 -\fBhppa_cmdline=\fRtext sets the PALO command line for HP\-PA. Up to 1023 -characters are permitted by default. With hppa_hdrversion=4 the limit is 127. -.br -Note that the first five hppa_ bootspecs are mandatory, if any of the -hppa_ bootspecs is used. Only hppa_hdrversion= is allowed to be missing. -.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 -\fBhppa_hdrversion=\fRnumber chooses between PALO header version 5 (default) -and version 4. -For the appropriate value see in PALO source code: PALOHDRVERSION. -.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. +\fBmips_discard\fR and \fBsparc_discard\fR +revoke any boot file declarations made for mips or mipsel resp. sparc. +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 @@ -4986,8 +4968,8 @@ Restore directory trees from a particular ISO session to disk Try to retrieve blocks from a damaged medium .SS .B As superuser learn about available drives -On Linux or FreeBSD consider to give rw\-permissions to those users or groups -which shall be able to use the drives with \fBxorriso\fR. +On Linux, FreeBSD or NetBSD consider to give rw\-permissions to those users +or groups which shall be able to use the drives with \fBxorriso\fR. On Solaris use pfexec. Consider to restrict privileges of \fBxorriso\fR to "base,sys_devices" and to give r\-permission to user or group. .br diff --git a/xorriso/xorriso.info b/xorriso/xorriso.info index db745bd1..8ba8e7b5 100644 --- a/xorriso/xorriso.info +++ b/xorriso/xorriso.info @@ -278,6 +278,8 @@ character device. E.g. -dev /dev/sg2 On FreeBSD the device files have names like -dev /dev/cd0 +On NetBSD: +-dev /dev/rcd0d On OpenSolaris: -dev /dev/rdsk/c4t0d0s2 Get a list of accessible drives by command @@ -371,8 +373,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, HP-PA. Those are mutually not -combinable and also not combinable with MBR, GPT, or APM. +Little Endian (DEC), SUN SPARC. 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,8 +2553,7 @@ 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, HP-PA -boot sector for HP PA-RISC machines. +Boot Block for old DECstation, SUN Disk Label for SPARC machines. The boot firmware EFI may use programs which are located in a FAT filesystem and announced by an MBR partition table entry. @@ -2761,26 +2762,9 @@ 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. - *hppa_cmdline=*text sets the PALO command line for HP-PA. Up to - 1023 characters are permitted by default. With hppa_hdrversion=4 - the limit is 127. - Note that the first five hppa_ bootspecs are mandatory, if any of - the hppa_ bootspecs is used. Only hppa_hdrversion= is allowed to - be missing. - *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. - *hppa_hdrversion=*number chooses between PALO header version 5 - (default) and version 4. For the appropriate value see in PALO - source code: PALOHDRVERSION. - *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. + *mips_discard* and *sparc_discard* revoke any boot file + declarations made for mips or mipsel resp. sparc. 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. @@ -4338,9 +4322,9 @@ File: xorriso.info, Node: ExDevices, Next: ExCreate, Prev: Frontend, Up: Exa 10.1 As superuser learn about available drives ============================================== -On Linux or FreeBSD consider to give rw-permissions to those users or -groups which shall be able to use the drives with `xorriso'. On -Solaris use pfexec. Consider to restrict privileges of `xorriso' to +On Linux, FreeBSD or NetBSD consider to give rw-permissions to those +users or groups which shall be able to use the drives with `xorriso'. +On Solaris use pfexec. Consider to restrict privileges of `xorriso' to "base,sys_devices" and to give r-permission to user or group. $ xorriso -device_links @@ -4919,7 +4903,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 266) + (line 248) * -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) @@ -4929,7 +4913,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 27) +* -boot_image controls bootability: Bootable. (line 26) * -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) @@ -5154,10 +5138,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 257) +* APM block size: Bootable. (line 239) * APM, _definition: Extras. (line 41) * Appendable media, _definition: Media. (line 38) -* Appended Filesystem Image, -append_partition: Bootable. (line 266) +* Appended Filesystem Image, -append_partition: Bootable. (line 248) * 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) @@ -5165,7 +5149,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 27) +* Bootability, control, -boot_image: Bootable. (line 26) * Bugs, reporting: Bugreport. (line 6) * cdrecord, Emulation: Emulation. (line 116) * Character Set, _definition: Charset. (line 6) @@ -5174,13 +5158,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 159) +* CHRP partition, _definition: Bootable. (line 158) * 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 199) -* Cylinder size, _definition: Bootable. (line 188) +* Cylinder alignment, _definition: Bootable. (line 198) +* Cylinder size, _definition: Bootable. (line 187) * 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) @@ -5212,7 +5196,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 168) +* EFI system partition, _definition: Bootable. (line 167) * El Torito, _definition: Extras. (line 19) * Emulation, -as: Emulation. (line 13) * Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 151) @@ -5238,10 +5222,9 @@ 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 254) -* HFS+ serial number: Bootable. (line 251) +* HFS+ allocation block size: Bootable. (line 236) +* HFS+ serial number: Bootable. (line 233) * 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) @@ -5291,13 +5274,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 127) +* MBR, set, -boot_image system_area=: Bootable. (line 126) * 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 210) +* MIPS boot file, activation: Bootable. (line 209) * mkisofs, Emulation: Emulation. (line 16) * Modifying, _definition: Methods. (line 27) * Multi-session media, _definition: Media. (line 7) @@ -5324,15 +5307,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 178) -* Partition table, _definition: Bootable. (line 139) +* Partition offset, _definition: Bootable. (line 177) +* Partition table, _definition: Bootable. (line 138) * 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 163) +* PReP partition, _definition: Bootable. (line 162) * Problems, reporting: Bugreport. (line 6) * Process, consolidate text output, -pkt_output: Frontend. (line 7) * Process, control abort on error, -abort_on: Exception. (line 27) @@ -5391,10 +5374,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 221) -* SUN SPARC boot images, activation: Bootable. (line 287) +* SUN Disk Label, production: Bootable. (line 220) +* SUN SPARC boot images, activation: Bootable. (line 269) * Symbolic link, create, -lns: Insert. (line 176) -* System area, _definition: Bootable. (line 127) +* System area, _definition: Bootable. (line 126) * 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) @@ -5410,7 +5393,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Verify, file tree checksums, -check_md5_r: Verify. (line 174) * Verify, preset -check_media, -check_media_defaults: Verify. (line 41) * Write, block size, -dvd_obs: SetWrite. (line 333) -* Write, bootability, -boot_image: Bootable. (line 27) +* Write, bootability, -boot_image: Bootable. (line 26) * Write, buffer syncing, -stdio_sync: SetWrite. (line 340) * Write, close media, -close: SetWrite. (line 357) * Write, compliance to specs, -compliance: SetWrite. (line 58) @@ -5445,54 +5428,54 @@ Node: Model3405 Node: Media6311 Node: Methods8982 Node: Drives11557 -Node: Extras15072 -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: Jigdo145684 -Node: Charset149931 -Node: Exception153246 -Node: DialogCtl159366 -Node: Inquiry161964 -Node: Navigate168281 -Node: Verify176579 -Node: Restore185843 -Node: Emulation192930 -Node: Scripting203232 -Node: Frontend211003 -Node: Examples220610 -Node: ExDevices221788 -Node: ExCreate222447 -Node: ExDialog223732 -Node: ExGrowing224997 -Node: ExModifying225802 -Node: ExBootable226306 -Node: ExCharset226858 -Node: ExPseudo227750 -Node: ExCdrecord228648 -Node: ExMkisofs228965 -Node: ExGrowisofs230305 -Node: ExException231440 -Node: ExTime231894 -Node: ExIncBackup232353 -Node: ExRestore236333 -Node: ExRecovery237266 -Node: Files237836 -Node: Seealso239135 -Node: Bugreport239858 -Node: Legal240439 -Node: CommandIdx241450 -Node: ConceptIdx258112 +Node: Extras15099 +Node: Processing19551 +Node: Dialog23171 +Node: Commands24849 +Node: ArgSort26526 +Node: AqDrive28018 +Node: Loading31063 +Node: Insert47992 +Node: SetInsert58206 +Node: Manip66783 +Node: CmdFind76563 +Node: Filter93164 +Node: Writing97720 +Node: SetWrite107851 +Node: Bootable128436 +Node: Jigdo144774 +Node: Charset149021 +Node: Exception152336 +Node: DialogCtl158456 +Node: Inquiry161054 +Node: Navigate167371 +Node: Verify175669 +Node: Restore184933 +Node: Emulation192020 +Node: Scripting202322 +Node: Frontend210093 +Node: Examples219700 +Node: ExDevices220878 +Node: ExCreate221544 +Node: ExDialog222829 +Node: ExGrowing224094 +Node: ExModifying224899 +Node: ExBootable225403 +Node: ExCharset225955 +Node: ExPseudo226847 +Node: ExCdrecord227745 +Node: ExMkisofs228062 +Node: ExGrowisofs229402 +Node: ExException230537 +Node: ExTime230991 +Node: ExIncBackup231450 +Node: ExRestore235430 +Node: ExRecovery236363 +Node: Files236933 +Node: Seealso238232 +Node: Bugreport238955 +Node: Legal239536 +Node: CommandIdx240547 +Node: ConceptIdx257209  End Tag Table diff --git a/xorriso/xorriso.texi b/xorriso/xorriso.texi index cdb0c662..2c003eca 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 20, 2014" +@c man .TH XORRISO 1 "Version 1.3.5, Mar 03, 2014" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -438,6 +438,10 @@ On FreeBSD the device files have names like @* -dev /dev/cd0 @* +On NetBSD: +@* + -dev /dev/rcd0d +@* On OpenSolaris: @* -dev /dev/rdsk/c4t0d0s2 @@ -567,7 +571,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, HP-PA. +MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC. Those are mutually not combinable and also not combinable with MBR, GPT, or APM. @* @@ -3401,7 +3405,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, HP-PA boot sector for HP PA-RISC machines. +SUN Disk Label for SPARC machines. @* The boot firmware EFI may use programs which are located in a FAT filesystem and announced by an MBR partition table entry. @@ -3676,32 +3680,9 @@ 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. @* -@cindex HP-PA boot sector, production -@strong{hppa_cmdline=}text sets the PALO command line for HP-PA. Up to 1023 -characters are permitted by default. With hppa_hdrversion=4 the limit is 127. -@* -Note that the first five hppa_ bootspecs are mandatory, if any of the -hppa_ bootspecs is used. Only hppa_hdrversion= is allowed to be missing. -@* -@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{hppa_hdrversion=}number chooses between PALO header version 5 (default) -and version 4. -For the appropriate value see in PALO source code: PALOHDRVERSION. -@* -@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. +@strong{mips_discard} and @strong{sparc_discard} +revoke any boot file declarations made for mips or mipsel resp. sparc. +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" @@ -5819,8 +5800,8 @@ Use text as name of this program and perform -help. @c man .B As superuser learn about available drives @node ExDevices, ExCreate, Frontend, Examples @section As superuser learn about available drives -On Linux or FreeBSD consider to give rw-permissions to those users or groups -which shall be able to use the drives with @command{xorriso}. +On Linux, FreeBSD or NetBSD consider to give rw-permissions to those users +or groups which shall be able to use the drives with @command{xorriso}. On Solaris use pfexec. Consider to restrict privileges of @command{xorriso} to "base,sys_devices" and to give r-permission to user or group. @* diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 7ca00d3b..15ed35f6 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2014.03.02.102010" +#define Xorriso_timestamP "2014.03.03.202815" diff --git a/xorriso/xorrisofs.1 b/xorriso/xorrisofs.1 index 2e14f36e..365f5563 100644 --- a/xorriso/xorrisofs.1 +++ b/xorriso/xorrisofs.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 XORRISOFS 1 "Version 1.3.5, Jan 15, 2014" +.TH XORRISOFS 1 "Version 1.3.5, Mar 03, 2014" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -1206,29 +1206,6 @@ 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. .TP -\fB\-hppa-cmdline\fR text -Set the PALO command line for HP\-PA. Up to 1023 characters are permitted -by default. With \-hppa\-hdrversion 4 the limit is 127. -.br -Note that the first five \-hppa options are mandatory, if any of the \-hppa -options is given. Only option \-hppa\-hdrversion is allowed to be missing. -.TP -\fB\-hppa-bootloader\fR iso_rr_path -Designate the given path as HP\-PA bootloader file. -.TP -\fB\-hppa-kernel-32\fR iso_rr_path -Designate the given path as HP\-PA 32 bit kernel file. -.TP -\fB\-hppa-kernel-64\fR iso_rr_path -Designate the given path as HP\-PA 64 bit kernel file. -.TP -\fB\-hppa-ramdisk\fR iso_rr_path -Designate the given path as HP\-PA RAM disk file. -.TP -\fB\-hppa-hdrversion\fR number -Choose between PALO header version 5 (default) and version 4. -For the appropriate value see in PALO source code: PALOHDRVERSION. -.TP .B Character sets: .PP Character sets should not matter as long as only english alphanumeric diff --git a/xorriso/xorrisofs.info b/xorriso/xorrisofs.info index c4184073..14a8cf4f 100644 --- a/xorriso/xorrisofs.info +++ b/xorriso/xorrisofs.info @@ -1183,29 +1183,6 @@ and also not combinable with MBR, GPT, or APM. number to byte 0x228. The size is written as 32 bit big-endian number to byte 0x230. --hppa-cmdline text - Set the PALO command line for HP-PA. Up to 1023 characters are - permitted by default. With -hppa-hdrversion 4 the limit is 127. - Note that the first five -hppa options are mandatory, if any of - the -hppa options is given. Only option -hppa-hdrversion is - allowed to be missing. - --hppa-bootloader iso_rr_path - Designate the given path as HP-PA bootloader file. - --hppa-kernel-32 iso_rr_path - Designate the given path as HP-PA 32 bit kernel file. - --hppa-kernel-64 iso_rr_path - Designate the given path as HP-PA 64 bit kernel file. - --hppa-ramdisk iso_rr_path - Designate the given path as HP-PA RAM disk file. - --hppa-hdrversion number - Choose between PALO header version 5 (default) and version 4. For - the appropriate value see in PALO source code: PALOHDRVERSION. -  File: xorrisofs.info, Node: Charset, Next: Jigdo, Prev: SystemArea, Up: Options @@ -1920,12 +1897,6 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T (line 16) * -hide-rr-moved set deep directory relocation target: SetExtras. (line 64) -* -hppa-bootloader HP-PA bootloader file: SystemArea. (line 216) -* -hppa-cmdline HP-PA PALO command line: SystemArea. (line 209) -* -hppa-hdrversion HP-PA PALO header version: SystemArea. (line 228) -* -hppa-kernel_32 HP-PA kernel_32 file: SystemArea. (line 219) -* -hppa-kernel_64 HP-PA kernel_64 file: SystemArea. (line 222) -* -hppa-ramdisk HP-PA ramdisk file: SystemArea. (line 225) * -input-charset set character set of disk file names: Charset. (line 17) * -iso-level define ISO 9660 limitations: SetCompl. (line 7) @@ -2055,12 +2026,6 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Bootability, control, -b, -eltorito-boot: Bootable. (line 32) * Bootability, control, -B, -sparc-boot: SystemArea. (line 184) * Bootability, control, -e: Bootable. (line 50) -* Bootability, control, -hppa-bootloader: SystemArea. (line 216) -* Bootability, control, -hppa-cmdline: SystemArea. (line 209) -* Bootability, control, -hppa-hdrversion: SystemArea. (line 228) -* Bootability, control, -hppa-kernel_32: SystemArea. (line 219) -* Bootability, control, -hppa-kernel_64: SystemArea. (line 222) -* Bootability, control, -hppa-ramdisk: SystemArea. (line 225) * Bootability, control, -mips-boot: SystemArea. (line 171) * Bootability, control, -mipsel-boot: SystemArea. (line 178) * Bootability, El Torito section id string, -eltorito-id: Bootable. @@ -2243,22 +2208,22 @@ Node: SetHide30412 Node: ImageId31720 Node: Bootable35888 Node: SystemArea40882 -Node: Charset52006 -Node: Jigdo53032 -Node: Miscellaneous57299 -Node: Examples58943 -Node: ExSimple59429 -Node: ExGraft59908 -Node: ExMkisofs61155 -Node: ExGrowisofs62408 -Node: ExIncBackup63580 -Node: ExIncBckAcc66688 -Node: ExBootable68364 -Node: Files70456 -Node: Seealso71530 -Node: Bugreport72186 -Node: Legal72767 -Node: CommandIdx73662 -Node: ConceptIdx88802 +Node: Charset51179 +Node: Jigdo52205 +Node: Miscellaneous56472 +Node: Examples58116 +Node: ExSimple58602 +Node: ExGraft59081 +Node: ExMkisofs60328 +Node: ExGrowisofs61581 +Node: ExIncBackup62753 +Node: ExIncBckAcc65861 +Node: ExBootable67537 +Node: Files69629 +Node: Seealso70703 +Node: Bugreport71359 +Node: Legal71940 +Node: CommandIdx72835 +Node: ConceptIdx87537  End Tag Table diff --git a/xorriso/xorrisofs.texi b/xorriso/xorrisofs.texi index 850c6b62..2c96ae1d 100644 --- a/xorriso/xorrisofs.texi +++ b/xorriso/xorrisofs.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 XORRISOFS 1 "Version 1.3.5, Jan 15, 2014" +@c man .TH XORRISOFS 1 "Version 1.3.5, Mar 03, 2014" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -1622,41 +1622,6 @@ Cause the content address and size of the given data file in the image 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. -@c man .TP -@item -hppa-cmdline text -@kindex -hppa-cmdline HP-PA PALO command line -@cindex Bootability, control, -hppa-cmdline -Set the PALO command line for HP-PA. Up to 1023 characters are permitted -by default. With -hppa-hdrversion 4 the limit is 127. -@* -Note that the first five -hppa options are mandatory, if any of the -hppa -options is given. Only option -hppa-hdrversion is allowed to be missing. -@c man .TP -@item -hppa-bootloader iso_rr_path -@kindex -hppa-bootloader HP-PA bootloader file -@cindex Bootability, control, -hppa-bootloader -Designate the given path as HP-PA bootloader file. -@c man .TP -@item -hppa-kernel-32 iso_rr_path -@kindex -hppa-kernel_32 HP-PA kernel_32 file -@cindex Bootability, control, -hppa-kernel_32 -Designate the given path as HP-PA 32 bit kernel file. -@c man .TP -@item -hppa-kernel-64 iso_rr_path -@kindex -hppa-kernel_64 HP-PA kernel_64 file -@cindex Bootability, control, -hppa-kernel_64 -Designate the given path as HP-PA 64 bit kernel file. -@c man .TP -@item -hppa-ramdisk iso_rr_path -@kindex -hppa-ramdisk HP-PA ramdisk file -@cindex Bootability, control, -hppa-ramdisk -Designate the given path as HP-PA RAM disk file. -@c man .TP -@item -hppa-hdrversion number -@kindex -hppa-hdrversion HP-PA PALO header version -@cindex Bootability, control, -hppa-hdrversion -Choose between PALO header version 5 (default) and version 4. -For the appropriate value see in PALO source code: PALOHDRVERSION. @end table @c man .TP @c man .B Character sets: