From 772561a33200c5931607262e348dd741e9953385 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 26 Sep 2014 12:13:02 +0000 Subject: [PATCH] Corrected description of -as mkisofs option -boot-load-size --- libisoburn/trunk/xorriso/xorrisofs.1 | 11 +++- libisoburn/trunk/xorriso/xorrisofs.info | 78 +++++++++++++------------ libisoburn/trunk/xorriso/xorrisofs.texi | 11 +++- 3 files changed, 56 insertions(+), 44 deletions(-) diff --git a/libisoburn/trunk/xorriso/xorrisofs.1 b/libisoburn/trunk/xorriso/xorrisofs.1 index 405b6199..8ad2ad0f 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.3.9, Jun 28, 2014" +.TH XORRISOFS 1 "Version 1.3.9, Sep 26, 2014" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -938,8 +938,13 @@ iso_rr_path, and again \-eltorito\-alt\-boot. This gesture is used for achieving EFI\-bootability of the GRUB2 rescue CD. .TP \fB\-boot-load-size\fR number -Set the number of 512\-byte blocks for boot images which emulate -a floppy or a hard disk. A safe default for non\-emulating boot images is 4. +Set the number of 512\-byte blocks to be loaded at boot time +from the boot image in the current catalog entry. +Non\-emulating BIOS bootimages usually need a load size of 4. +EFI boot images usually get set the number of blocks occupied +by the boot image file. +.br +El Torito cannot represent load sizes higher than 65535. .TP \fB\-hard-disk-boot\fR Mark the boot image in the current catalog entry as emulated hard disk. diff --git a/libisoburn/trunk/xorriso/xorrisofs.info b/libisoburn/trunk/xorriso/xorrisofs.info index 2a522aac..f9cc44c3 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.info +++ b/libisoburn/trunk/xorriso/xorrisofs.info @@ -923,9 +923,11 @@ Sytem Area. EFI-bootability of the GRUB2 rescue CD. -boot-load-size number - Set the number of 512-byte blocks for boot images which emulate a - floppy or a hard disk. A safe default for non-emulating boot - images is 4. + Set the number of 512-byte blocks to be loaded at boot time from + the boot image in the current catalog entry. Non-emulating BIOS + bootimages usually need a load size of 4. EFI boot images usually + get set the number of blocks occupied by the boot image file. + El Torito cannot represent load sizes higher than 65535. -hard-disk-boot Mark the boot image in the current catalog entry as emulated hard @@ -1813,12 +1815,12 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * --acl Recording of ACLs: SetExtras. (line 71) * --application_use set Application Use field: ImageId. (line 90) * --boot-catalog-hide Hide El Torito boot catalog: Bootable. - (line 114) + (line 116) * --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 37) * --for_backup Enable backup fidelity: SetExtras. (line 67) -* --grub2-boot-info Patch El Torito boot image: Bootable. (line 99) +* --grub2-boot-info Patch El Torito boot image: Bootable. (line 101) * --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) @@ -1857,9 +1859,9 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -b El Torito PC-BIOS boot image: Bootable. (line 32) * -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-info-table Patch El Torito boot image: Bootable. (line 95) * -boot-load-size El Torito boot image load size: Bootable. (line 63) -* -c El Torito boot catalog name: Bootable. (line 105) +* -c El Torito boot catalog name: Bootable. (line 107) * -C set load address and write address offset: Loading. (line 28) * -cdrecord-params set load address and write address offset: Loading. (line 50) @@ -1881,10 +1883,10 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -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 111) -* -eltorito-id El Torito boot section id string: Bootable. (line 80) +* -eltorito-catalog El Torito boot catalog name: Bootable. (line 113) +* -eltorito-id El Torito boot section id string: Bootable. (line 82) * -eltorito-selcrit El Torito boot selection criteria: Bootable. - (line 88) + (line 90) * -exclude exclude disk files from inserting: SetInsert. (line 42) * -exclude-list exclude disk files from inserting: SetInsert. (line 51) @@ -1898,7 +1900,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -graft-points enable target=source pathspecs: SetInsert. (line 31) * -gui increase frequency of pacifier messages: Miscellaneous. (line 31) -* -hard-disk-boot El Torito boot image emulation: Bootable. (line 68) +* -hard-disk-boot El Torito boot image emulation: Bootable. (line 70) * -help list supported options: Miscellaneous. (line 23) * -hfs-bless HFS+ blessing ppc_bootdir: SetExtras. (line 188) * -hfs-bless-by HFS+ blessing: SetExtras. (line 177) @@ -1961,7 +1963,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -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-emul-boot El Torito boot image emulation: Bootable. (line 74) * -no-pad do not add zeros to ISO tree: SetProduct. (line 104) * -o set output file address: SetProduct. (line 8) * -old-exclude exclude disk files from inserting: SetInsert. @@ -2041,17 +2043,17 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Block address, set sorting weight, --sort-weight-patterns: SetProduct. (line 84) * Bootability, boot catalog hidden, --boot-catalog-hide: Bootable. - (line 114) + (line 116) * Bootability, boot catalog name, -c, -eltorito-catalog: Bootable. - (line 105) + (line 107) * Bootability, boot image emulation, -hard-disk-boot: Bootable. - (line 68) + (line 70) * Bootability, boot image load size, -boot-load-size: Bootable. (line 63) * Bootability, boot image patching, --grub2-boot-info: Bootable. - (line 99) + (line 101) * Bootability, boot image patching, -boot-info-table: Bootable. - (line 93) + (line 95) * Bootability, control, --grub2-sparc-core: SystemArea. (line 202) * Bootability, control, --efi-boot: Bootable. (line 58) * Bootability, control, -b, -eltorito-boot: Bootable. (line 32) @@ -2066,9 +2068,9 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * 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) + (line 82) * Bootability, El Torito selection criteria, -eltorito-selcrit: Bootable. - (line 88) + (line 90) * Bootability, fill System Area e.g. by MBR, -G, --embedded-boot, -generic-boot: SystemArea. (line 25) * Bootability, for CHRP, -chrp-boot-part: SystemArea. (line 156) @@ -2086,7 +2088,7 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top (line 68) * Bootability, next entry, -eltorito-alt-boot: Bootable. (line 43) * Bootability, no boot image emulation, -no-emul-boot: Bootable. - (line 72) + (line 74) * Bootability, patch System Area partition table, --protective-msdos-label: SystemArea. (line 82) * Bootability, SUN Disk Label text, -sparc-label: SystemArea. (line 199) @@ -2244,23 +2246,23 @@ Node: SetExtras21917 Node: SetHide30591 Node: ImageId31899 Node: Bootable36067 -Node: SystemArea41061 -Node: Charset52192 -Node: Jigdo53218 -Node: Miscellaneous57485 -Node: Examples59129 -Node: ExSimple59615 -Node: ExGraft60094 -Node: ExMkisofs61341 -Node: ExGrowisofs62594 -Node: ExIncBackup63766 -Node: ExIncBckAcc66884 -Node: ExBootable68560 -Node: Files70652 -Node: Seealso71726 -Node: Bugreport72382 -Node: Legal72963 -Node: CommandIdx73858 -Node: ConceptIdx88998 +Node: SystemArea41247 +Node: Charset52378 +Node: Jigdo53404 +Node: Miscellaneous57671 +Node: Examples59315 +Node: ExSimple59801 +Node: ExGraft60280 +Node: ExMkisofs61527 +Node: ExGrowisofs62780 +Node: ExIncBackup63952 +Node: ExIncBckAcc67070 +Node: ExBootable68746 +Node: Files70838 +Node: Seealso71912 +Node: Bugreport72568 +Node: Legal73149 +Node: CommandIdx74044 +Node: ConceptIdx89184  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorrisofs.texi b/libisoburn/trunk/xorriso/xorrisofs.texi index 852c0fdd..66d84288 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.3.9, Jun 28, 2014" +@c man .TH XORRISOFS 1 "Version 1.3.9, Sep 26, 2014" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -1286,8 +1286,13 @@ used for achieving EFI-bootability of the GRUB2 rescue CD. @item -boot-load-size number @kindex -boot-load-size El Torito boot image load size @cindex Bootability, boot image load size, -boot-load-size -Set the number of 512-byte blocks for boot images which emulate -a floppy or a hard disk. A safe default for non-emulating boot images is 4. +Set the number of 512-byte blocks to be loaded at boot time +from the boot image in the current catalog entry. +Non-emulating BIOS bootimages usually need a load size of 4. +EFI boot images usually get set the number of blocks occupied +by the boot image file. +@* +El Torito cannot represent load sizes higher than 65535. @c man .TP @item -hard-disk-boot @kindex -hard-disk-boot El Torito boot image emulation