From f838da1a7f2e32f0b87bece36960e3e34a4ff71f Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 14 Apr 2013 17:49:29 +0000 Subject: [PATCH] Updated man page and help texts about new features --- libisoburn/trunk/xorriso/emulators.c | 2 +- libisoburn/trunk/xorriso/opts_d_h.c | 6 +- libisoburn/trunk/xorriso/xorriso.1 | 24 +++- libisoburn/trunk/xorriso/xorriso.info | 123 +++++++++------- libisoburn/trunk/xorriso/xorriso.texi | 24 +++- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- libisoburn/trunk/xorriso/xorrisofs.1 | 23 ++- libisoburn/trunk/xorriso/xorrisofs.info | 142 +++++++++++-------- libisoburn/trunk/xorriso/xorrisofs.texi | 29 +++- 9 files changed, 250 insertions(+), 125 deletions(-) diff --git a/libisoburn/trunk/xorriso/emulators.c b/libisoburn/trunk/xorriso/emulators.c index 89885905..25dfe9ed 100644 --- a/libisoburn/trunk/xorriso/emulators.c +++ b/libisoburn/trunk/xorriso/emulators.c @@ -845,7 +845,7 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag) " --modification-date=YYYYMMDDhhmmsscc", " Override date of creation and modification", " -isohybrid-mbr FILE Set SYSLINUX mbr/isohdp[fp]x*.bin for isohybrid", -" --grub2-mbr FILE Set GRUB2 MBR for patching at byte 432", +" --grub2-mbr FILE Set GRUB2 MBR for boot image address patching", #ifdef Xorriso_with_isohybriD " isolinux_mbr=on|auto|off Control eventual isohybrid MBR generation", #endif diff --git a/libisoburn/trunk/xorriso/opts_d_h.c b/libisoburn/trunk/xorriso/opts_d_h.c index 9be36d09..2e995f4b 100644 --- a/libisoburn/trunk/xorriso/opts_d_h.c +++ b/libisoburn/trunk/xorriso/opts_d_h.c @@ -1626,11 +1626,13 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) " -boot_image \"any\"|\"isolinux\"|\"grub\"", " |\"discard\"|\"keep\"|\"patch\"|\"dir=\"|\"bin_path=\"", " |\"cat_path=\"|\"cat_hidden=on|iso_rr|joliet|off\"", -" |\"load_size=\"|\"system_area=\"|\"partition_table=on|off\"", +" |\"load_size=\"|\"boot_info_table=\"", +" |\"grub2_boot_info=\"|\"grub2_mbr=\"", +" |\"system_area=\"|\"partition_table=on|off\"", " |\"chrp_boot_part=on|off=\"|\"prep_boot_part=\"", " |\"efi_boot_part=\"|\"efi_boot_part=--efi-boot-image\"", " |\"mips_path=\"|\"mipsel_path=\"|\"mips_discard\"", -" |\"sparc_label=\"|\"sparc_discard\"", +" |\"sparc_label=\"|\"grub2_sparc_core=\"|\"sparc_discard\"", " |\"hfsplus_serial=\"|\"hfsplus_block_size=\"", " |\"apm_block_size=\"|\"show_status\"", " Whether to discard or keep an exiting El Torito boot image.", diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1 index a1d14de7..5aad5e90 100644 --- a/libisoburn/trunk/xorriso/xorriso.1 +++ b/libisoburn/trunk/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.2.9, Mar 18, 2013" +.TH XORRISO 1 "Version 1.2.9, Apr 14, 2013" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -2839,8 +2839,16 @@ The default "no_emulation" is suitable for ISOLINUX, GRUB, FreeBSD cdboot. \fBload_size=\fR is a value which depends on the boot image. Default 2048 should be overridden only if a better value is known. .br -\fBboot_info_table=on\fR may be used to apply patching to a boot image which -is given by "any" "bin_path=". "boot_info_table=off" disables patching. +\fBboot_info_table=on\fR causes address patching to bytes 8 to 63 +of the boot image which is given by "any" "bin_path=". +"boot_info_table=off" disables this patching. +.br +\fBgrub2_boot_info=on\fR causes address patching to byte 2548 +of the boot image which is given by "any" "bin_path=". +The address is written as 64 bit little\-endian number. It is the +2KB block address of the boot image content, multiplied by 4, +and then incremented by 5. +"grub2_boot_info=off" disables this patching. .br \fBplatform_id=\fR defines by two hex digits the Platform ID of the boot image. "00" is 80x86 PC\-BIOS, "01" is PowerPC, "02" is Mac, "ef" is EFI. @@ -2877,6 +2885,11 @@ to the ISO image. .br \-boot_image isolinux system_area= implies "partition_table=on". .br +\fBgrub2_mbr=\fRdisk_path works like "any" system_area= with additional +patching for modern GRUB MBRs. The content start address of the first boot +image is converted to a count of 512 byte blocks, and an offset of 4 is added. +The result is written as 64 bit little\-endian number to byte address 0x1b0. +.br \fBpartition_table=on\fR causes a simple partition table to be written into bytes 446 to 511 of the System Area. .br @@ -2978,6 +2991,11 @@ for partitions 2 to 8. Partition 1 will always be the ISO image. See command \-append_partition. The first 512 bytes of any data provided by system_area= will be overwritten. .br +\fBgrub2_sparc_core=\fRiso_rr_path causes the content address and size +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. diff --git a/libisoburn/trunk/xorriso/xorriso.info b/libisoburn/trunk/xorriso/xorriso.info index 0e221ea1..0d935cb2 100644 --- a/libisoburn/trunk/xorriso/xorriso.info +++ b/libisoburn/trunk/xorriso/xorriso.info @@ -2509,9 +2509,14 @@ filesystem and announced by an MBR partition table entry. cdboot. *load_size=* is a value which depends on the boot image. Default 2048 should be overridden only if a better value is known. - *boot_info_table=on* may be used to apply patching to a boot image - which is given by "any" "bin_path=". "boot_info_table=off" - disables patching. + *boot_info_table=on* causes address patching to bytes 8 to 63 of + the boot image which is given by "any" "bin_path=". + "boot_info_table=off" disables this patching. + *grub2_boot_info=on* causes address patching to byte 2548 of the + boot image which is given by "any" "bin_path=". The address is + written as 64 bit little-endian number. It is the 2KB block + address of the boot image content, multiplied by 4, and then + incremented by 5. "grub2_boot_info=off" disables this patching. *platform_id=* defines by two hex digits the Platform ID of the boot image. "00" is 80x86 PC-BIOS, "01" is PowerPC, "02" is Mac, "ef" is EFI. @@ -2540,6 +2545,11 @@ filesystem and announced by an MBR partition table entry. Other than a El Torito boot image, the file disk_path needs not to be added to the ISO image. -boot_image isolinux system_area= implies "partition_table=on". + *grub2_mbr=*disk_path works like "any" system_area= with additional + patching for modern GRUB MBRs. The content start address of the + first boot image is converted to a count of 512 byte blocks, and + an offset of 4 is added. The result is written as 64 bit + little-endian number to byte address 0x1b0. *partition_table=on* causes a simple partition table to be written into bytes 446 to 511 of the System Area. With type "isolinux" it shows a partition that begins at byte 0 @@ -2627,6 +2637,11 @@ filesystem and announced by an MBR partition table entry. append images for partitions 2 to 8. Partition 1 will always be the ISO image. See command -append_partition. The first 512 bytes of any data provided by system_area= will be overwritten. + *grub2_sparc_core=*iso_rr_path causes the content address and size + 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. *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 @@ -4705,7 +4720,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 180) * -append_partition adds arbitrary file after image end: Bootable. - (line 234) + (line 249) * -application_id sets application id: SetWrite. (line 192) * -as emulates mkisofs or cdrecord: Emulation. (line 13) * -assert_volid rejects undesired images: Loading. (line 84) @@ -4935,10 +4950,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 225) +* APM block size: Bootable. (line 240) * APM, _definition: Extras. (line 41) * Appendable media, _definition: Media. (line 38) -* Appended Filesystem Image, -append_partition: Bootable. (line 234) +* Appended Filesystem Image, -append_partition: Bootable. (line 249) * Automatic execution order, of arguments, -x: ArgSort. (line 16) * Backslash Interpretation, _definition: Processing. (line 52) * Backup, enable fast incremental, -disk_dev_ino: Loading. (line 190) @@ -4955,13 +4970,13 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Character Set, for output, -out_charset: SetWrite. (line 258) * Character set, learn from image, -auto_charset: Loading. (line 98) * Character Set, of terminal, -local_charset: Charset. (line 47) -* CHRP partition, _definition: Bootable. (line 148) +* CHRP partition, _definition: Bootable. (line 158) * Closed media, _definition: Media. (line 43) * Comment, #: Scripting. (line 162) * Control, signal handling, -signal_handling: Exception. (line 69) * Create, new ISO image, _definition: Methods. (line 6) -* Cylinder alignment, _definition: Bootable. (line 188) -* Cylinder size, _definition: Bootable. (line 177) +* Cylinder alignment, _definition: Bootable. (line 198) +* Cylinder size, _definition: Bootable. (line 187) * Damaged track and session, close, -close_damaged: Writing. (line 158) * Delete, from ISO image, -rm: Manip. (line 21) * Delete, from ISO image, -rm_r: Manip. (line 28) @@ -4992,7 +5007,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 157) +* 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) @@ -5018,8 +5033,8 @@ 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 110) -* HFS+ allocation block size: Bootable. (line 222) -* HFS+ serial number: Bootable. (line 219) +* HFS+ allocation block size: Bootable. (line 237) +* HFS+ serial number: Bootable. (line 234) * hidden, set in ISO image, -hide: Manip. (line 184) * Image reading, cache size, -data_cache_size: Loading. (line 269) * Image, _definition: Model. (line 9) @@ -5065,13 +5080,13 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Jigdo Template Extraction, _definition: Jigdo. (line 6) * List delimiter, _definition: Processing. (line 9) * MBR, _definition: Extras. (line 26) -* MBR, set, -boot_image system_area=: Bootable. (line 121) +* MBR, set, -boot_image system_area=: Bootable. (line 126) * MD5, control handling, -md5: Loading. (line 156) * Media, erase, -blank: Writing. (line 61) * Media, format, -format: Writing. (line 91) * Media, list formats, -list_formats: Writing. (line 129) * Media, list write speeds, -list_speeds: Writing. (line 141) -* MIPS boot file, activation: Bootable. (line 199) +* MIPS boot file, activation: Bootable. (line 209) * mkisofs, Emulation: Emulation. (line 16) * Modifying, _definition: Methods. (line 27) * Multi-session media, _definition: Media. (line 7) @@ -5097,15 +5112,15 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Ownership, global in ISO image, -uid: SetWrite. (line 264) * Ownership, in ISO image, -chown: Manip. (line 49) * Ownership, in ISO image, -chown_r: Manip. (line 54) -* Partition offset, _definition: Bootable. (line 167) -* Partition table, _definition: Bootable. (line 128) +* 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 35) * 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 152) +* 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) @@ -5161,10 +5176,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 11) * Sorting order, for -x, -list_arg_sorting: ArgSort. (line 27) -* SUN Disk Label, production: Bootable. (line 210) -* SUN SPARC boot images, activation: Bootable. (line 255) +* SUN Disk Label, production: Bootable. (line 220) +* SUN SPARC boot images, activation: Bootable. (line 270) * Symbolic link, create, -lns: Insert. (line 175) -* System area, _definition: Bootable. (line 121) +* System area, _definition: Bootable. (line 126) * Table-of-content, search sessions, -rom_toc_scan: Loading. (line 211) * Table-of-content, show, -toc: Inquiry. (line 28) * Timestamps, set in ISO image, -alter_date: Manip. (line 154) @@ -5229,39 +5244,39 @@ Node: Filter89141 Node: Writing93697 Node: SetWrite103085 Node: Bootable121836 -Node: Jigdo137230 -Node: Charset141477 -Node: Exception144239 -Node: DialogCtl150359 -Node: Inquiry152957 -Node: Navigate159035 -Node: Verify167333 -Node: Restore176365 -Node: Emulation183452 -Node: Scripting193576 -Node: Frontend200737 -Node: Examples208812 -Node: ExDevices209990 -Node: ExCreate210649 -Node: ExDialog211934 -Node: ExGrowing213199 -Node: ExModifying214004 -Node: ExBootable214508 -Node: ExCharset215060 -Node: ExPseudo215881 -Node: ExCdrecord216779 -Node: ExMkisofs217096 -Node: ExGrowisofs218436 -Node: ExException219571 -Node: ExTime220025 -Node: ExIncBackup220484 -Node: ExRestore224476 -Node: ExRecovery225436 -Node: Files226006 -Node: Seealso227305 -Node: Bugreport228028 -Node: Legal228609 -Node: CommandIdx229620 -Node: ConceptIdx245922 +Node: Jigdo138226 +Node: Charset142473 +Node: Exception145235 +Node: DialogCtl151355 +Node: Inquiry153953 +Node: Navigate160031 +Node: Verify168329 +Node: Restore177361 +Node: Emulation184448 +Node: Scripting194572 +Node: Frontend201733 +Node: Examples209808 +Node: ExDevices210986 +Node: ExCreate211645 +Node: ExDialog212930 +Node: ExGrowing214195 +Node: ExModifying215000 +Node: ExBootable215504 +Node: ExCharset216056 +Node: ExPseudo216877 +Node: ExCdrecord217775 +Node: ExMkisofs218092 +Node: ExGrowisofs219432 +Node: ExException220567 +Node: ExTime221021 +Node: ExIncBackup221480 +Node: ExRestore225472 +Node: ExRecovery226432 +Node: Files227002 +Node: Seealso228301 +Node: Bugreport229024 +Node: Legal229605 +Node: CommandIdx230616 +Node: ConceptIdx246918  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorriso.texi b/libisoburn/trunk/xorriso/xorriso.texi index 25b645f2..fdf9075c 100644 --- a/libisoburn/trunk/xorriso/xorriso.texi +++ b/libisoburn/trunk/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.2.9, Mar 18, 2013" +@c man .TH XORRISO 1 "Version 1.2.9, Apr 14, 2013" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -3353,8 +3353,16 @@ The default "no_emulation" is suitable for ISOLINUX, GRUB, FreeBSD cdboot. @strong{load_size=} is a value which depends on the boot image. Default 2048 should be overridden only if a better value is known. @* -@strong{boot_info_table=on} may be used to apply patching to a boot image which -is given by "any" "bin_path=". "boot_info_table=off" disables patching. +@strong{boot_info_table=on} causes address patching to bytes 8 to 63 +of the boot image which is given by "any" "bin_path=". +"boot_info_table=off" disables this patching. +@* +@strong{grub2_boot_info=on} causes address patching to byte 2548 +of the boot image which is given by "any" "bin_path=". +The address is written as 64 bit little-endian number. It is the +2KB block address of the boot image content, multiplied by 4, +and then incremented by 5. +"grub2_boot_info=off" disables this patching. @* @strong{platform_id=} defines by two hex digits the Platform ID of the boot image. "00" is 80x86 PC-BIOS, "01" is PowerPC, "02" is Mac, "ef" is EFI. @@ -3393,6 +3401,11 @@ to the ISO image. @* -boot_image isolinux system_area= implies "partition_table=on". @* +@strong{grub2_mbr=}disk_path works like "any" system_area= with additional +patching for modern GRUB MBRs. The content start address of the first boot +image is converted to a count of 512 byte blocks, and an offset of 4 is added. +The result is written as 64 bit little-endian number to byte address 0x1b0. +@* @cindex Partition table, _definition @strong{partition_table=on} causes a simple partition table to be written into bytes 446 to 511 of the System Area. @@ -3503,6 +3516,11 @@ for partitions 2 to 8. Partition 1 will always be the ISO image. See command -append_partition. The first 512 bytes of any data provided by system_area= will be overwritten. @* +@strong{grub2_sparc_core=}iso_rr_path causes the content address and size +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. diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index d934aa31..3d132407 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2013.04.14.174539" +#define Xorriso_timestamP "2013.04.14.174902" diff --git a/libisoburn/trunk/xorriso/xorrisofs.1 b/libisoburn/trunk/xorriso/xorrisofs.1 index 3812c528..df88eca3 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.1 +++ b/libisoburn/trunk/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.2.9, Mar 18, 2013" +.TH XORRISOFS 1 "Version 1.2.9, Apr 14, 2013" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -915,11 +915,18 @@ Up to 20 bytes get read from the given characters [0\-9A\-Fa\-f]. They get attributed to the boot image entry in the catalog. .TP \fB\-boot-info-table\fR -Overwrite certain bytes in the current boot image. The information will be +Overwrite bytes 8 to 63 in the current boot image. The information will be supplied by xorriso in the course of image production: Block address of the Primary Volume Descriptor, block address of the boot image file, size of the boot image file. .TP +\fB\fR --grub2-boot-info +Overwrite bytes 2548 to 2555 in the current boot image by the address +of that boot image. +The address is written as 64 bit little\-endian number. It is the +2KB block address of the boot image content, multiplied by 4, +and then incremented by 5. +.TP \fB\-c\fR iso_rr_path Set the address of the El Torito boot catalog file within the image. This file address is not significant for the booting PC\-BIOS or EFI, @@ -973,6 +980,12 @@ Alias of \-G. \fB--embedded-boot\fR disk_path Alias of \-G. .TP +\fB\fR --grub2-mbr disk_path +Install disk_path in the System Area and treat it as modern GRUB2 MBR. +The content start address of the first boot +image is converted to a count of 512 byte blocks, and an offset of 4 is added. +The result is written as 64 bit little\-endian number to byte address 0x1b0. +.TP \fB\-isohybrid-mbr\fR disk_path Install disk_path as ISOLINUX isohybrid MBR which makes the boot image given by option \-b bootable from USB sticks and hard disks via PC\-BIOS. @@ -1138,6 +1151,12 @@ Alias of \-B. \fB\-sparc-label\fR text Set the ASCII label text of a SUN Disk Label. .TP +\fB\fR --grub2-sparc-core iso_rr_path +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. +.TP .B Character sets: .PP Character sets should not matter as long as only english alphanumeric diff --git a/libisoburn/trunk/xorriso/xorrisofs.info b/libisoburn/trunk/xorriso/xorrisofs.info index 6bbafa5d..af586a7c 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.info +++ b/libisoburn/trunk/xorriso/xorrisofs.info @@ -906,11 +906,17 @@ Sytem Area. attributed to the boot image entry in the catalog. -boot-info-table - Overwrite certain bytes in the current boot image. The information + Overwrite bytes 8 to 63 in the current boot image. The information will be supplied by xorriso in the course of image production: Block address of the Primary Volume Descriptor, block address of the boot image file, size of the boot image file. +--grub2-boot-info + Overwrite bytes 2548 to 2555 in the current boot image by the + address of that boot image. The address is written as 64 bit + little-endian number. It is the 2KB block address of the boot + image content, multiplied by 4, and then incremented by 5. + -c iso_rr_path Set the address of the El Torito boot catalog file within the image. This file address is not significant for the booting @@ -961,6 +967,13 @@ and also not combinable with MBR, GPT, or APM. --embedded-boot disk_path Alias of -G. +--grub2-mbr disk_path + Install disk_path in the System Area and treat it as modern GRUB2 + MBR. The content start address of the first boot image is + converted to a count of 512 byte blocks, and an offset of 4 is + added. The result is written as 64 bit little-endian number to + byte address 0x1b0. + -isohybrid-mbr disk_path Install disk_path as ISOLINUX isohybrid MBR which makes the boot image given by option -b bootable from USB sticks and hard disks @@ -1118,6 +1131,13 @@ and also not combinable with MBR, GPT, or APM. -sparc-label text Set the ASCII label text of a SUN Disk Label. +--grub2-sparc-core iso_rr_path + 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. +  File: xorrisofs.info, Node: Charset, Next: Jigdo, Prev: SystemArea, Up: Options @@ -1715,11 +1735,14 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * --acl Recording of ACLs: SetExtras. (line 71) * --boot-catalog-hide Hide El Torito boot catalog: Bootable. - (line 108) + (line 114) * --efi-boot El Torito EFI boot image: Bootable. (line 58) * --embedded-boot Fill System Area e.g. by MBR: SystemArea. (line 35) * --emul-toc enable table-of-content emulation: SetProduct. (line 35) * --for_backup Enable backup fidelity: SetExtras. (line 67) +* --grub2-boot-info Patch El Torito boot image: Bootable. (line 99) +* --grub2-mbr Install modern GRUB2 MBR: SystemArea. (line 38) +* --grub2-sparc-core SUN SPARC core file: SystemArea. (line 202) * --hardlinks Recording of hardlink relations: SetExtras. (line 92) * --md5 Recording of MD5 checksums: SetExtras. (line 84) * --modification-date set ISO image timestamps: ImageId. (line 82) @@ -1734,7 +1757,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T (line 84) * --old-root-no-md5 disable MD5 with -old-root: SetInsert. (line 105) * --protective-msdos-label Patch System Area partition table: SystemArea. - (line 75) + (line 82) * --quoted_path_list read pathspecs from disk file: SetInsert. (line 13) * --scdbackup_tag Recording of MD5 checksum: SetExtras. (line 101) @@ -1746,21 +1769,21 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -abstract set Abstract File path: ImageId. (line 66) * -allow-lowercase lowercase in ISO file names: SetCompl. (line 46) * -append_partition Append MBR partition after image: SystemArea. - (line 121) + (line 128) * -appid set Application Id: ImageId. (line 46) * -b El Torito PC-BIOS boot image: Bootable. (line 32) -* -B SUN SPARC boot images: SystemArea. (line 177) +* -B SUN SPARC boot images: SystemArea. (line 184) * -biblio set Biblio File path: ImageId. (line 72) * -boot-info-table Patch El Torito boot image: Bootable. (line 93) * -boot-load-size El Torito boot image load size: Bootable. (line 63) -* -c El Torito boot catalog name: Bootable. (line 99) +* -c El Torito boot catalog name: Bootable. (line 105) * -C set load address and write address offset: Loading. (line 28) * -cdrecord-params set load address and write address offset: Loading. (line 50) * -checksum_algorithm_iso choose .jigdo checksums: Jigdo. (line 80) * -checksum_algorithm_template choose .template checksums: Jigdo. (line 87) -* -chrp-boot-part CHRP partition: SystemArea. (line 149) +* -chrp-boot-part CHRP partition: SystemArea. (line 156) * -copyright set Copyright File path: ImageId. (line 77) * -D allow deep directory hierachies: SetExtras. (line 31) * -d omit trailing dot in ISO file names: SetCompl. (line 56) @@ -1771,11 +1794,11 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -disallow_dir_id_ext enforce ISO level 1 directory names: SetCompl. (line 24) * -e El Torito EFI boot image: Bootable. (line 50) -* -efi-boot-part EFI boot partition: SystemArea. (line 138) +* -efi-boot-part EFI boot partition: SystemArea. (line 145) * -eltorito-alt-boot begin next boot catalog entry: Bootable. (line 43) * -eltorito-boot El Torito PC-BIOS boot image: Bootable. (line 40) -* -eltorito-catalog El Torito boot catalog name: Bootable. (line 105) +* -eltorito-catalog El Torito boot catalog name: Bootable. (line 111) * -eltorito-id El Torito boot section id string: Bootable. (line 80) * -eltorito-selcrit El Torito boot selection criteria: Bootable. (line 88) @@ -1818,12 +1841,12 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T (line 17) * -iso-level define ISO 9660 limitations: SetCompl. (line 7) * -isohybrid-apm-hfsplus Mark boot image in APM: SystemArea. - (line 66) -* -isohybrid-gpt-basdat Mark boot image in GPT: SystemArea. (line 49) + (line 73) +* -isohybrid-gpt-basdat Mark boot image in GPT: SystemArea. (line 56) * -isohybrid-gpt-hfsplus Mark boot image in GPT: SystemArea. - (line 61) + (line 68) * -isohybrid-mbr Install ISOLINUX isohybrid MBR: SystemArea. - (line 38) + (line 45) * -J enable production of Joliet directory tree: SetExtras. (line 110) * -jigdo-exclude add exclusion pattern for .md5: Jigdo. (line 59) * -jigdo-force-md5 add check pattern for .md5: Jigdo. (line 52) @@ -1843,8 +1866,8 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -max-iso9660-filenames allow 37 characters in ISO file names: SetCompl. (line 69) * -md5-list set path of readable .md5: Jigdo. (line 73) -* -mips-boot MIPS Big Endian boot image: SystemArea. (line 164) -* -mipsel-boot MIPS Little Endian boot image: SystemArea. (line 171) +* -mips-boot MIPS Big Endian boot image: SystemArea. (line 171) +* -mipsel-boot MIPS Little Endian boot image: SystemArea. (line 178) * -N omit version number in ISO file names: SetCompl. (line 73) * -no-emul-boot El Torito boot image emulation: Bootable. (line 72) * -no-pad do not add zeros to ISO tree: SetProduct. (line 76) @@ -1862,13 +1885,13 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -p set Preparer Id: ImageId. (line 54) * -P set Publisher Id: ImageId. (line 30) * -pad add 300 KiB of zeros to ISO tree: SetProduct. (line 69) -* -partition_cyl_align Image size alignment: SystemArea. (line 109) -* -partition_hd_cyl MBR heads per cylinder: SystemArea. (line 92) +* -partition_cyl_align Image size alignment: SystemArea. (line 116) +* -partition_hd_cyl MBR heads per cylinder: SystemArea. (line 99) * -partition_offset Make mountable by partition 1: SystemArea. - (line 80) -* -partition_sec_hd MBR sectors per head: SystemArea. (line 96) + (line 87) +* -partition_sec_hd MBR sectors per head: SystemArea. (line 103) * -path-list read pathspecs from disk file: SetInsert. (line 8) -* -prep-boot-part PReP partition: SystemArea. (line 158) +* -prep-boot-part PReP partition: SystemArea. (line 165) * -preparer set Preparer Id: ImageId. (line 63) * -prev-session set path for loading existing ISO image: Loading. (line 22) @@ -1886,8 +1909,8 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -root redirect ISO root directory: SetInsert. (line 64) * -rr_reloc_dir set deep directory relocation target: SetExtras. (line 47) -* -sparc-boot SUN SPARC boot images: SystemArea. (line 189) -* -sparc-label SUN Disk Label text: SystemArea. (line 192) +* -sparc-boot SUN SPARC boot images: SystemArea. (line 196) +* -sparc-label SUN Disk Label text: SystemArea. (line 199) * -sysid set System Id: ImageId. (line 49) * -transparent-compression enable recognition of zisofs files: SetInsert. (line 61) @@ -1921,44 +1944,49 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Biblio File, set path, -biblio: ImageId. (line 72) * Block address, set sort weight, --sort-weight: SetProduct. (line 49) * Bootability, boot catalog hidden, --boot-catalog-hide: Bootable. - (line 108) + (line 114) * Bootability, boot catalog name, -c, -eltorito-catalog: Bootable. - (line 99) + (line 105) * Bootability, boot image emulation, -hard-disk-boot: Bootable. (line 68) * Bootability, boot image load size, -boot-load-size: Bootable. (line 63) +* Bootability, boot image patching, --grub2-boot-info: Bootable. + (line 99) * Bootability, boot image patching, -boot-info-table: Bootable. (line 93) +* Bootability, control, --grub2-sparc-core: SystemArea. (line 202) * Bootability, control, --efi-boot: Bootable. (line 58) * Bootability, control, -b, -eltorito-boot: Bootable. (line 32) -* Bootability, control, -B, -sparc-boot: SystemArea. (line 177) +* Bootability, control, -B, -sparc-boot: SystemArea. (line 184) * Bootability, control, -e: Bootable. (line 50) -* Bootability, control, -mips-boot: SystemArea. (line 164) -* Bootability, control, -mipsel-boot: SystemArea. (line 171) +* Bootability, control, -mips-boot: SystemArea. (line 171) +* Bootability, control, -mipsel-boot: SystemArea. (line 178) * Bootability, El Torito section id string, -eltorito-id: Bootable. (line 80) * Bootability, El Torito selection criteria, -eltorito-selcrit: Bootable. (line 88) * Bootability, fill System Area e.g. by MBR, -G, --embedded-boot, -generic-boot: SystemArea. (line 25) -* Bootability, for CHRP, -chrp-boot-part: SystemArea. (line 149) -* Bootability, for EFI, -efi-boot-part: SystemArea. (line 138) -* Bootability, for PReP, -prep-boot-part: SystemArea. (line 158) +* Bootability, for CHRP, -chrp-boot-part: SystemArea. (line 156) +* Bootability, for EFI, -efi-boot-part: SystemArea. (line 145) +* Bootability, for PReP, -prep-boot-part: SystemArea. (line 165) * Bootability, install ISOLINUX isohybrid MBR, -isohybrid-mbr: SystemArea. + (line 45) +* Bootability, install modern GRUB2 MBR, --grub2-mbr: SystemArea. (line 38) * Bootability, mark boot image in APM, -isohybrid-apm-hfsplus: SystemArea. - (line 66) + (line 73) * Bootability, mark boot image in GPT, -isohybrid-gpt-basdat: SystemArea. - (line 49) + (line 56) * Bootability, mark boot image in GPT, -isohybrid-gpt-hfsplus: SystemArea. - (line 61) + (line 68) * Bootability, next entry, -eltorito-alt-boot: Bootable. (line 43) * Bootability, no boot image emulation, -no-emul-boot: Bootable. (line 72) * Bootability, patch System Area partition table, --protective-msdos-label: SystemArea. - (line 75) -* Bootability, SUN Disk Label text, -sparc-label: SystemArea. (line 192) + (line 82) +* Bootability, SUN Disk Label text, -sparc-label: SystemArea. (line 199) * Bugs, reporting: Bugreport. (line 6) * Character Set, for disk file names, -input-charset: Charset. (line 17) @@ -1996,7 +2024,7 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Hiding, from ISO and Rock Ridge, -hide-list: SetHide. (line 16) * Hiding, from Joliet, -hide-joliet: SetHide. (line 20) * Hiding, from Joliet, -hide-joliet-list: SetHide. (line 25) -* Image size, alignment, -partition_cyl_align: SystemArea. (line 109) +* Image size, alignment, -partition_cyl_align: SystemArea. (line 116) * Incremental insertion, disable disk ino, --old-root-no-ino: SetInsert. (line 84) * Incremental insertion, disable MD5, --old-root-no-md5: SetInsert. @@ -2047,13 +2075,13 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Links, follow on disk, -f, -follow-links: SetInsert. (line 24) * Links, record and load hard links, --hardlinks: SetExtras. (line 92) * MBR, _definition: SystemArea. (line 9) -* MBR, append partition, -append_partition: SystemArea. (line 121) -* MBR, sectors per head, -partition_sec_hd: SystemArea. (line 92) +* MBR, append partition, -append_partition: SystemArea. (line 128) +* MBR, sectors per head, -partition_sec_hd: SystemArea. (line 99) * MD5, record and load, --md5: SetExtras. (line 84) * Message output, redirect stderr, -log-file: Miscellaneous. (line 28) * Message output, suppress, -quiet: Miscellaneous. (line 24) * Mountability, by non-trivial partition 1, -partition_offset: SystemArea. - (line 80) + (line 87) * Options, list, -help: Miscellaneous. (line 20) * Output file, set address, -o, -output: SetProduct. (line 8) * Padding, 300 KiB, -pad: SetProduct. (line 69) @@ -2109,23 +2137,23 @@ Node: SetExtras20451 Node: SetHide28860 Node: ImageId30168 Node: Bootable33673 -Node: SystemArea38383 -Node: Charset48026 -Node: Jigdo49052 -Node: Miscellaneous53319 -Node: Examples54692 -Node: ExSimple55178 -Node: ExGraft55657 -Node: ExMkisofs56904 -Node: ExGrowisofs58157 -Node: ExIncBackup59329 -Node: ExIncBckAcc62437 -Node: ExBootable64113 -Node: Files66205 -Node: Seealso67279 -Node: Bugreport67935 -Node: Legal68516 -Node: CommandIdx69411 -Node: ConceptIdx83258 +Node: SystemArea38667 +Node: Charset48964 +Node: Jigdo49990 +Node: Miscellaneous54257 +Node: Examples55630 +Node: ExSimple56116 +Node: ExGraft56595 +Node: ExMkisofs57842 +Node: ExGrowisofs59095 +Node: ExIncBackup60267 +Node: ExIncBckAcc63375 +Node: ExBootable65051 +Node: Files67143 +Node: Seealso68217 +Node: Bugreport68873 +Node: Legal69454 +Node: CommandIdx70349 +Node: ConceptIdx84415  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorrisofs.texi b/libisoburn/trunk/xorriso/xorrisofs.texi index 8c1075e3..266a2c3f 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.texi +++ b/libisoburn/trunk/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.2.9, Mar 18, 2013" +@c man .TH XORRISOFS 1 "Version 1.2.9, Apr 14, 2013" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -1265,11 +1265,20 @@ They get attributed to the boot image entry in the catalog. @item -boot-info-table @kindex -boot-info-table Patch El Torito boot image @cindex Bootability, boot image patching, -boot-info-table -Overwrite certain bytes in the current boot image. The information will be +Overwrite bytes 8 to 63 in the current boot image. The information will be supplied by xorriso in the course of image production: Block address of the Primary Volume Descriptor, block address of the boot image file, size of the boot image file. @c man .TP +@item @minus{}@minus{}grub2-boot-info +@kindex @minus{}@minus{}grub2-boot-info Patch El Torito boot image +@cindex Bootability, boot image patching, @minus{}@minus{}grub2-boot-info +Overwrite bytes 2548 to 2555 in the current boot image by the address +of that boot image. +The address is written as 64 bit little-endian number. It is the +2KB block address of the boot image content, multiplied by 4, +and then incremented by 5. +@c man .TP @item -c iso_rr_path @kindex -c El Torito boot catalog name @cindex Bootability, boot catalog name, -c, -eltorito-catalog @@ -1341,6 +1350,14 @@ Alias of -G. @kindex @minus{}@minus{}embedded-boot Fill System Area e.g. by MBR Alias of -G. @c man .TP +@item @minus{}@minus{}grub2-mbr disk_path +@kindex @minus{}@minus{}grub2-mbr Install modern GRUB2 MBR +@cindex Bootability, install modern GRUB2 MBR, @minus{}@minus{}grub2-mbr +Install disk_path in the System Area and treat it as modern GRUB2 MBR. +The content start address of the first boot +image is converted to a count of 512 byte blocks, and an offset of 4 is added. +The result is written as 64 bit little-endian number to byte address 0x1b0. +@c man .TP @item -isohybrid-mbr disk_path @kindex -isohybrid-mbr Install ISOLINUX isohybrid MBR @cindex Bootability, install ISOLINUX isohybrid MBR, -isohybrid-mbr @@ -1540,6 +1557,14 @@ Alias of -B. @kindex -sparc-label SUN Disk Label text @cindex Bootability, SUN Disk Label text, -sparc-label Set the ASCII label text of a SUN Disk Label. +@c man .TP +@item @minus{}@minus{}grub2-sparc-core iso_rr_path +@kindex @minus{}@minus{}grub2-sparc-core SUN SPARC core file +@cindex Bootability, control, @minus{}@minus{}grub2-sparc-core +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. @end table @c man .TP @c man .B Character sets: