From 59da586abe7164494d90e9ca6ce2ed86979b0b10 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 21 Sep 2012 12:03:32 +0000 Subject: [PATCH] New -boot_image partition_cyl_align mode "all" --- xorriso/emulators.c | 2 +- xorriso/opts_a_c.c | 3 + xorriso/text_io.c | 2 +- xorriso/xorriso.1 | 10 +++- xorriso/xorriso.info | 110 ++++++++++++++++++------------------ xorriso/xorriso.texi | 12 ++-- xorriso/xorriso_timestamp.h | 2 +- xorriso/xorrisofs.1 | 8 ++- xorriso/xorrisofs.info | 75 ++++++++++++------------ xorriso/xorrisofs.texi | 8 ++- 10 files changed, 127 insertions(+), 105 deletions(-) diff --git a/xorriso/emulators.c b/xorriso/emulators.c index 5c162f10..19271828 100644 --- a/xorriso/emulators.c +++ b/xorriso/emulators.c @@ -829,7 +829,7 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag) " -partition_offset LBA Make image mountable by first partition, too", " -partition_sec_hd NUMBER Define number of sectors per head", " -partition_hd_cyl NUMBER Define number of heads per cylinder", -" -partition_cyl_align MODE Control cylinder alignment: off, on, auto", +" -partition_cyl_align MODE Control cylinder alignment: off, on, auto, all", " -mips-boot FILE Set mips boot image name (relative to image root)", " -mipsel-boot FILE Set mipsel boot image name (relative to image root)", " -B FILES, -sparc-boot FILES Set sparc boot image names", diff --git a/xorriso/opts_a_c.c b/xorriso/opts_a_c.c index 4b35c16e..79874c9e 100644 --- a/xorriso/opts_a_c.c +++ b/xorriso/opts_a_c.c @@ -959,6 +959,9 @@ treatment_patch:; else if(strcmp(treatpt + 20, "off") == 0) xorriso->system_area_options= (xorriso->system_area_options & ~0x300) | 0x200; + else if(strcmp(treatpt + 20, "all") == 0) + xorriso->system_area_options= + (xorriso->system_area_options & ~0x300) | 0x300; else { sprintf(xorriso->info_text, "-boot_image %s partition_cyl_align: unknown mode : %s", diff --git a/xorriso/text_io.c b/xorriso/text_io.c index fbefae87..4e85ba7a 100644 --- a/xorriso/text_io.c +++ b/xorriso/text_io.c @@ -2008,7 +2008,7 @@ int Xorriso_status(struct XorrisO *xorriso, char *filter, FILE *fp, int flag) ret= (xorriso->system_area_options & 0x300) >> 8; is_default= (ret == 0); sprintf(line,"-boot_image any partition_cyl_align=%s\n", - ret == 0 ? "auto" : ret == 1 ? "on" : "off"); + ret == 0 ? "auto" : ret == 1 ? "on" : ret == 3 ? "all" : "off"); if(!(is_default && no_defaults)) Xorriso_status_result(xorriso,filter,fp,flag&2); diff --git a/xorriso/xorriso.1 b/xorriso/xorriso.1 index c49f706d..56a976c3 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.2.5, Aug 14, 2012" +.TH XORRISO 1 "Version 1.2.5, Sep 21, 2012" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -789,7 +789,7 @@ will be copied to \-in_charset. Enable or disable recording and interpretation of the output character set name in an xattr attribute of the image root directory. If enabled and if a recorded character set name is found, then this name will be used as -namoe of the input character set when reading an image. +name of the input character set when reading an image. .br Note that the default output charset is the local character set of the terminal where \fBxorriso\fR runs. Before attributing this local @@ -2916,6 +2916,9 @@ Mode "auto" is default. Alignment by padding happens only with "isolinux" "partition_table=on". .br Mode "on" causes alignment by padding with "partition_table=on" for any type. +Mode "all" is like "on" but also pads up partitions from \-append_partition +to an aligned size. +.br Mode "off" disables alignment for any type. .br \fBmips_path=\fRiso_rr_path declares a data file in the image to be a @@ -2962,7 +2965,8 @@ size 2048 will not be mountable \-t hfsplus at least by older Linux kernels. Cause a prepared filesystem image to be appended to the ISO image and to be described by a partition table entry in a boot block at the start of the emerging ISO image. The partition entry will bear the size of the submitted -file rounded up to the next multiple of 2048 bytes. +file rounded up to the next multiple of 2048 bytes or to the next multiple +of the cylinder size. .br Beware of subsequent multi\-session runs. The appended partition will get overwritten. diff --git a/xorriso/xorriso.info b/xorriso/xorriso.info index d25f6fc5..2258a275 100644 --- a/xorriso/xorriso.info +++ b/xorriso/xorriso.info @@ -732,7 +732,7 @@ activate them only after image loading. Enable or disable recording and interpretation of the output character set name in an xattr attribute of the image root directory. If enabled and if a recorded character set name is - found, then this name will be used as namoe of the input character + found, then this name will be used as name of the input character set when reading an image. Note that the default output charset is the local character set of the terminal where `xorriso' runs. Before attributing this local @@ -841,7 +841,7 @@ activate them only after image loading. Note that -disk_dev_ino "off" is totally in effect only if -hardlinks is "off", too. --rom_toc_scan "on"|"force"|"off"[:"emul_on"|"emul_off"][:"emul_wide"|"emul_narrow"] +-rom_toc_scan "on"|"force"|"off"[:"emul_off"][:"emul_wide"] Read-only drives do not tell the actual media type but show any media as ROM (e.g. as DVD-ROM). The session history of MMC multi-session media might be truncated to first and last session @@ -2581,7 +2581,9 @@ filesystem and announced by an MBR partition table entry. Mode "auto" is default. Alignment by padding happens only with "isolinux" "partition_table=on". Mode "on" causes alignment by padding with "partition_table=on" - for any type. Mode "off" disables alignment for any type. + for any type. Mode "all" is like "on" but also pads up partitions + from -append_partition to an aligned size. + Mode "off" disables alignment for any type. *mips_path=*iso_rr_path declares a data file in the image to be a MIPS Big Endian boot file and causes production of a MIPS Big Endian Volume Header. This is mutually exclusive with production @@ -2621,7 +2623,7 @@ filesystem and announced by an MBR partition table entry. and to be described by a partition table entry in a boot block at the start of the emerging ISO image. The partition entry will bear the size of the submitted file rounded up to the next multiple of - 2048 bytes. + 2048 bytes or to the next multiple of the cylinder size. Beware of subsequent multi-session runs. The appended partition will get overwritten. Partitions may be appended with boot block type MBR and with SUN @@ -4526,7 +4528,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -alter_date sets timestamps in ISO image: Manip. (line 147) * -alter_date_r sets timestamps in ISO image: Manip. (line 167) * -append_partition adds arbitrary file after image end: Bootable. - (line 232) + (line 234) * -application_id sets application id: SetWrite. (line 190) * -as emulates mkisofs or cdrecord: Emulation. (line 13) * -assert_volid rejects undesired images: Loading. (line 84) @@ -4750,10 +4752,10 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * ACL, set in ISO image, -setfacl_r: Manip. (line 98) * ACL, show in ISO image, -getfacl: Navigate. (line 70) * ACL, show in ISO image, -getfacl_r: Navigate. (line 77) -* APM block size: Bootable. (line 223) +* APM block size: Bootable. (line 225) * APM, _definition: Extras. (line 41) * Appendable media, _definition: Media. (line 38) -* Appended Filesystem Image, -append_partition: Bootable. (line 232) +* Appended Filesystem Image, -append_partition: Bootable. (line 234) * 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) @@ -4831,8 +4833,8 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Group, in ISO image, -chgrp_r: Manip. (line 55) * Growing, _definition: Methods. (line 19) * Hard links, control handling, -hardlinks: Loading. (line 110) -* HFS+ allocation block size: Bootable. (line 220) -* HFS+ serial number: Bootable. (line 217) +* HFS+ allocation block size: Bootable. (line 222) +* HFS+ serial number: Bootable. (line 219) * hidden, set in ISO image, -hide: Manip. (line 171) * Image reading, cache size, -data_cache_size: Loading. (line 269) * Image, _definition: Model. (line 9) @@ -4884,7 +4886,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Media, format, -format: Writing. (line 88) * Media, list formats, -list_formats: Writing. (line 126) * Media, list write speeds, -list_speeds: Writing. (line 138) -* MIPS boot file, activation: Bootable. (line 197) +* MIPS boot file, activation: Bootable. (line 199) * mkisofs, Emulation: Emulation. (line 16) * Modifying, _definition: Methods. (line 27) * Multi-session media, _definition: Media. (line 7) @@ -4972,8 +4974,8 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Session, mount parameters, -mount_opts: Inquiry. (line 57) * Session, select as input, -load: Loading. (line 11) * Sorting order, for -x, -list_arg_sorting: ArgSort. (line 27) -* SUN Disk Label, production: Bootable. (line 208) -* SUN SPARC boot images, activation: Bootable. (line 253) +* SUN Disk Label, production: Bootable. (line 210) +* SUN SPARC boot images, activation: Bootable. (line 255) * System area, _definition: Bootable. (line 121) * Table-of-content, search sessions, -rom_toc_scan: Loading. (line 211) * Table-of-content, show, -toc: Inquiry. (line 28) @@ -5031,47 +5033,47 @@ Node: Options24480 Node: ArgSort26154 Node: AqDrive27644 Node: Loading30688 -Node: Insert46168 -Node: SetInsert56084 -Node: Manip64660 -Node: CmdFind73483 -Node: Filter88187 -Node: Writing92742 -Node: SetWrite101706 -Node: Bootable120339 -Node: Jigdo135582 -Node: Charset139828 -Node: Exception142589 -Node: DialogCtl148708 -Node: Inquiry151305 -Node: Navigate156171 -Node: Verify164468 -Node: Restore173499 -Node: Emulation180408 -Node: Scripting190219 -Node: Frontend197379 -Node: Examples198679 -Node: ExDevices199856 -Node: ExCreate200515 -Node: ExDialog201800 -Node: ExGrowing203065 -Node: ExModifying203870 -Node: ExBootable204374 -Node: ExCharset204926 -Node: ExPseudo205747 -Node: ExCdrecord206645 -Node: ExMkisofs206962 -Node: ExGrowisofs208302 -Node: ExException209437 -Node: ExTime209891 -Node: ExIncBackup210350 -Node: ExRestore214342 -Node: ExRecovery215302 -Node: Files215872 -Node: Seealso217171 -Node: Bugreport217894 -Node: Legal218475 -Node: CommandIdx219486 -Node: ConceptIdx235358 +Node: Insert46143 +Node: SetInsert56059 +Node: Manip64635 +Node: CmdFind73458 +Node: Filter88162 +Node: Writing92717 +Node: SetWrite101681 +Node: Bootable120314 +Node: Jigdo135707 +Node: Charset139953 +Node: Exception142714 +Node: DialogCtl148833 +Node: Inquiry151430 +Node: Navigate156296 +Node: Verify164593 +Node: Restore173624 +Node: Emulation180533 +Node: Scripting190344 +Node: Frontend197504 +Node: Examples198804 +Node: ExDevices199981 +Node: ExCreate200640 +Node: ExDialog201925 +Node: ExGrowing203190 +Node: ExModifying203995 +Node: ExBootable204499 +Node: ExCharset205051 +Node: ExPseudo205872 +Node: ExCdrecord206770 +Node: ExMkisofs207087 +Node: ExGrowisofs208427 +Node: ExException209562 +Node: ExTime210016 +Node: ExIncBackup210475 +Node: ExRestore214467 +Node: ExRecovery215427 +Node: Files215997 +Node: Seealso217296 +Node: Bugreport218019 +Node: Legal218600 +Node: CommandIdx219611 +Node: ConceptIdx235483  End Tag Table diff --git a/xorriso/xorriso.texi b/xorriso/xorriso.texi index 9e9aa4c7..c4a79281 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.2.5, Aug 14, 2012" +@c man .TH XORRISO 1 "Version 1.2.5, Sep 21, 2012" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -1018,7 +1018,7 @@ will be copied to -in_charset. Enable or disable recording and interpretation of the output character set name in an xattr attribute of the image root directory. If enabled and if a recorded character set name is found, then this name will be used as -namoe of the input character set when reading an image. +name of the input character set when reading an image. @* Note that the default output charset is the local character set of the terminal where @command{xorriso} runs. Before attributing this local @@ -1149,7 +1149,7 @@ The speed advantage appears only if the loaded session was produced with Note that -disk_dev_ino "off" is totally in effect only if -hardlinks is "off", too. @c man .TP -@item -rom_toc_scan "on"|"force"|"off"[:"emul_on"|"emul_off"][:"emul_wide"|"emul_narrow"] +@item -rom_toc_scan "on"|"force"|"off"[:"emul_off"][:"emul_wide"] @kindex -rom_toc_scan searches for sessions @cindex Table-of-content, search sessions, -rom_toc_scan Read-only drives do not tell the actual media type but show any media as @@ -3435,6 +3435,9 @@ Mode "auto" is default. Alignment by padding happens only with "isolinux" "partition_table=on". @* Mode "on" causes alignment by padding with "partition_table=on" for any type. +Mode "all" is like "on" but also pads up partitions from -append_partition +to an aligned size. +@* Mode "off" disables alignment for any type. @* @cindex MIPS boot file, activation @@ -3491,7 +3494,8 @@ size 2048 will not be mountable -t hfsplus at least by older Linux kernels. Cause a prepared filesystem image to be appended to the ISO image and to be described by a partition table entry in a boot block at the start of the emerging ISO image. The partition entry will bear the size of the submitted -file rounded up to the next multiple of 2048 bytes. +file rounded up to the next multiple of 2048 bytes or to the next multiple +of the cylinder size. @* Beware of subsequent multi-session runs. The appended partition will get overwritten. diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index b03b9278..74d5a48f 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2012.09.21.115522" +#define Xorriso_timestamP "2012.09.21.120245" diff --git a/xorriso/xorrisofs.1 b/xorriso/xorrisofs.1 index 6a4e408d..10419fc7 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.2.5, Jul 20, 2012" +.TH XORRISOFS 1 "Version 1.2.5, Sep 21, 2012" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -1036,13 +1036,17 @@ option \-isohybrid\-mbr is given. .br Mode "on" causes alignment by padding with option \-\-protective\-msdos\-label too. +Mode "all" is like "on" but also pads up partitions from \-append_partition +to an aligned size. +.br Mode "off" disables alignment unconditionally. .TP \fB\-append_partition\fR partition_number type_code disk_path Cause a prepared filesystem image to be appended to the ISO image and to be described by a partition table entry in a boot block at the start of the emerging ISO image. The partition entry will bear the size of the submitted -file rounded up to the next multiple of 2048 bytes. +file rounded up to the next multiple of 2048 bytes or to the next multiple +of the cylinder size. .br Beware of subsequent multi\-session runs. The appended partition will get overwritten. diff --git a/xorriso/xorrisofs.info b/xorriso/xorrisofs.info index 604fb5a9..340731f3 100644 --- a/xorriso/xorrisofs.info +++ b/xorriso/xorrisofs.info @@ -1022,15 +1022,16 @@ and also not combinable with MBR, GPT, or APM. Mode "auto" is default. Alignment by padding happens only if option -isohybrid-mbr is given. Mode "on" causes alignment by padding with option - --protective-msdos-label too. Mode "off" disables alignment - unconditionally. + --protective-msdos-label too. Mode "all" is like "on" but also + pads up partitions from -append_partition to an aligned size. + Mode "off" disables alignment unconditionally. -append_partition partition_number type_code disk_path Cause a prepared filesystem image to be appended to the ISO image and to be described by a partition table entry in a boot block at the start of the emerging ISO image. The partition entry will bear the size of the submitted file rounded up to the next multiple of - 2048 bytes. + 2048 bytes or to the next multiple of the cylinder size. Beware of subsequent multi-session runs. The appended partition will get overwritten. partition_number may be 1 to 4. Number 1 will put the whole ISO @@ -1727,10 +1728,10 @@ 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 115) + (line 116) * -appid set Application Id: ImageId. (line 46) * -b El Torito PC-BIOS boot image: Bootable. (line 32) -* -B SUN SPARC boot images: SystemArea. (line 171) +* -B SUN SPARC boot images: SystemArea. (line 172) * -biblio set Biblio File path: ImageId. (line 72) * -boot-info-table Patch El Torito boot image: Bootable. (line 80) * -boot-load-size El Torito boot image load size: Bootable. (line 63) @@ -1741,7 +1742,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -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 143) +* -chrp-boot-part CHRP partition: SystemArea. (line 144) * -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) @@ -1752,7 +1753,7 @@ 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 132) +* -efi-boot-part EFI boot partition: SystemArea. (line 133) * -eltorito-alt-boot begin next boot catalog entry: Bootable. (line 43) * -eltorito-boot El Torito PC-BIOS boot image: Bootable. (line 40) @@ -1821,8 +1822,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 158) -* -mipsel-boot MIPS Little Endian boot image: SystemArea. (line 165) +* -mips-boot MIPS Big Endian boot image: SystemArea. (line 159) +* -mipsel-boot MIPS Little Endian boot image: SystemArea. (line 166) * -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) @@ -1846,7 +1847,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T (line 75) * -partition_sec_hd MBR sectors per head: SystemArea. (line 91) * -path-list read pathspecs from disk file: SetInsert. (line 8) -* -prep-boot-part PReP partition: SystemArea. (line 152) +* -prep-boot-part PReP partition: SystemArea. (line 153) * -preparer set Preparer Id: ImageId. (line 63) * -prev-session set path for loading existing ISO image: Loading. (line 22) @@ -1864,8 +1865,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 183) -* -sparc-label SUN Disk Label text: SystemArea. (line 186) +* -sparc-boot SUN SPARC boot images: SystemArea. (line 184) +* -sparc-label SUN Disk Label text: SystemArea. (line 187) * -sysid set System Id: ImageId. (line 49) * -transparent-compression enable recognition of zisofs files: SetInsert. (line 61) @@ -1910,15 +1911,15 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top (line 80) * Bootability, control, --efi-boot: Bootable. (line 58) * Bootability, control, -b, -eltorito-boot: Bootable. (line 32) -* Bootability, control, -B, -sparc-boot: SystemArea. (line 171) +* Bootability, control, -B, -sparc-boot: SystemArea. (line 172) * Bootability, control, -e: Bootable. (line 50) -* Bootability, control, -mips-boot: SystemArea. (line 158) -* Bootability, control, -mipsel-boot: SystemArea. (line 165) +* Bootability, control, -mips-boot: SystemArea. (line 159) +* Bootability, control, -mipsel-boot: SystemArea. (line 166) * Bootability, fill System Area e.g. by MBR, -G, --embedded-boot, -generic-boot: SystemArea. (line 25) -* Bootability, for CHRP, -chrp-boot-part: SystemArea. (line 143) -* Bootability, for EFI, -efi-boot-part: SystemArea. (line 132) -* Bootability, for PReP, -prep-boot-part: SystemArea. (line 152) +* Bootability, for CHRP, -chrp-boot-part: SystemArea. (line 144) +* Bootability, for EFI, -efi-boot-part: SystemArea. (line 133) +* Bootability, for PReP, -prep-boot-part: SystemArea. (line 153) * Bootability, install ISOLINUX isohybrid MBR, -isohybrid-mbr: SystemArea. (line 38) * Bootability, mark boot image in APM, -isohybrid-apm-hfsplus: SystemArea. @@ -1932,7 +1933,7 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top (line 72) * Bootability, patch System Area partition table, --protective-msdos-label: SystemArea. (line 70) -* Bootability, SUN Disk Label text, -sparc-label: SystemArea. (line 186) +* Bootability, SUN Disk Label text, -sparc-label: SystemArea. (line 187) * Bugs, reporting: Bugreport. (line 6) * Character Set, for disk file names, -input-charset: Charset. (line 17) @@ -2021,7 +2022,7 @@ 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 115) +* MBR, append partition, -append_partition: SystemArea. (line 116) * MBR, sectors per head, -partition_sec_hd: SystemArea. (line 87) * MD5, record and load, --md5: SetExtras. (line 84) * Message output, redirect stderr, -log-file: Miscellaneous. (line 28) @@ -2084,22 +2085,22 @@ Node: SetHide28860 Node: ImageId30168 Node: Bootable33673 Node: SystemArea37738 -Node: Charset46946 -Node: Jigdo47972 -Node: Miscellaneous52239 -Node: Examples53612 -Node: ExSimple54098 -Node: ExGraft54577 -Node: ExMkisofs55824 -Node: ExGrowisofs57077 -Node: ExIncBackup58249 -Node: ExIncBckAcc61357 -Node: ExBootable63033 -Node: Files65125 -Node: Seealso66199 -Node: Bugreport66855 -Node: Legal67436 -Node: CommandIdx68331 -Node: ConceptIdx81965 +Node: Charset47091 +Node: Jigdo48117 +Node: Miscellaneous52384 +Node: Examples53757 +Node: ExSimple54243 +Node: ExGraft54722 +Node: ExMkisofs55969 +Node: ExGrowisofs57222 +Node: ExIncBackup58394 +Node: ExIncBckAcc61502 +Node: ExBootable63178 +Node: Files65270 +Node: Seealso66344 +Node: Bugreport67000 +Node: Legal67581 +Node: CommandIdx68476 +Node: ConceptIdx82110  End Tag Table diff --git a/xorriso/xorrisofs.texi b/xorriso/xorrisofs.texi index 7d9d3a27..df0e48f4 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.2.5, Jul 20, 2012" +@c man .TH XORRISOFS 1 "Version 1.2.5, Sep 21, 2012" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -1418,6 +1418,9 @@ option -isohybrid-mbr is given. @* Mode "on" causes alignment by padding with option @minus{}@minus{}protective-msdos-label too. +Mode "all" is like "on" but also pads up partitions from -append_partition +to an aligned size. +@* Mode "off" disables alignment unconditionally. @c man .TP @item -append_partition partition_number type_code disk_path @@ -1426,7 +1429,8 @@ Mode "off" disables alignment unconditionally. Cause a prepared filesystem image to be appended to the ISO image and to be described by a partition table entry in a boot block at the start of the emerging ISO image. The partition entry will bear the size of the submitted -file rounded up to the next multiple of 2048 bytes. +file rounded up to the next multiple of 2048 bytes or to the next multiple +of the cylinder size. @* Beware of subsequent multi-session runs. The appended partition will get overwritten.