From b6873d70cf42b050aebfd84a2b01011b2ebe7074 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sat, 5 Mar 2011 17:42:25 +0000 Subject: [PATCH] Mentioned man xorrisofs in man xorriso --- libisoburn/trunk/xorriso/xorriso.1 | 30 ++++--- libisoburn/trunk/xorriso/xorriso.info | 108 ++++++++++++++------------ libisoburn/trunk/xorriso/xorriso.texi | 34 +++++--- 3 files changed, 101 insertions(+), 71 deletions(-) diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1 index 128f5786..61f4df38 100644 --- a/libisoburn/trunk/xorriso/xorriso.1 +++ b/libisoburn/trunk/xorriso/xorriso.1 @@ -2522,10 +2522,10 @@ The offset value of an ISO image gets preserved when a new session is added. So the value defined here is only in effect if a new ISO image gets written. .br \fBpartition_hd_cyl=\fRnumber gives the number of heads per cylinder for -partition offset. 0 chooses a default value. Maximum is 255. +the partition table. 0 chooses a default value. Maximum is 255. .br \fBpartition_sec_hd=\fRnumber gives the number of sectors per head for -partition offset. 0 chooses a default value. Maximum is 63. +the partition table. 0 chooses a default value. Maximum is 63. .br The product partition_sec_hd * partition_hd_cyl * 512 is the cylinder size. It should be divisible by 2048 in order to allow exact alignment. @@ -3564,10 +3564,9 @@ file paths and pathspecs. A lot of options are not supported and lead to failure of the mkisofs emulation. Some are ignored, but better do not rely on this tolerance. .br --graft-points is equivalent to -pathspecs on. Note that pathspecs without "=" -are interpreted differently than with xorriso option -add. Directories get -merged with the root directory of the ISO image, other filetypes get mapped -into that root directory. +The supported options are documented in detail in xorrisofs.info +and in man xorrisofs. The description here is focused on the effect +of mkisofs emulation in the context of a xorriso run. .br Other than with the "cdrecord" personality there is no automatic -commit at the end of a "mkisofs" option list. Verbosity settings -v (= "UPDATE") and @@ -3575,6 +3574,11 @@ the end of a "mkisofs" option list. Verbosity settings -v (= "UPDATE") and persists until things happen like -commit, -rollback, -dev, or end of xorriso. -pacifier gets set to "mkisofs" if files are added to the image. .br +-graft-points is equivalent to -pathspecs on. Note that pathspecs without "=" +are interpreted differently than with xorriso option -add. Directories get +merged with the root directory of the ISO image, other filetypes get mapped +into that root directory. +.br If pathspecs are given and if no output file was chosen before or during the "mkisofs" option list, then standard output (-outdev "-") will get into effect. If -o points to a regular file, then it will be truncated to 0 bytes @@ -3656,11 +3660,8 @@ The options of genisoimage Jigdo Template Extraction are recognized and performed via xorriso option -jigdo. See the "Alias:" names there for the meaning of the genisoimage options. .br ---no_rc as first argument prevents interpretation of -startup files. See section FILES below. -.br -Personalites "\fBxorrisofs\fR", "\fBgenisoimage\fR", +Personalities "\fBxorrisofs\fR", "\fBgenisoimage\fR", and "\fBgenisofs\fR" are aliases for "mkisofs". .br If xorriso is started with one of the leafnames "xorrisofs", "genisofs", @@ -3670,6 +3671,9 @@ I.e. all arguments will be interpreted mkisofs style until "--" is encountered. From then on, options are interpreted as xorriso options. .br +--no_rc as first argument of such a program start +prevents interpretation of startup files. See section FILES below. +.br Personality "\fBcdrecord\fR" accepts the options listed with: .br @@ -3712,6 +3716,9 @@ If xorriso is started with one of the leafnames "xorrecord", "cdrskin", to the command line arguments. I.e. all arguments will be interpreted cdrecord style until "--" is encountered and an eventual commit happens. From then on, options are interpreted as xorriso options. +.br +--no_rc as first argument of such a program start +prevents interpretation of xorriso startup files. See section FILES below. .TP \fB\-read_mkisofsrc\fR Try one by one to open for reading: @@ -4485,6 +4492,9 @@ The default setting of -check_media abort_file= is: .br .SH SEE ALSO .TP +For the mkisofs emulation of xorriso +.BR xorrisofs(1) +.TP For mounting xorriso generated ISO 9660 images (-t iso9660) .BR mount(8) .TP diff --git a/libisoburn/trunk/xorriso/xorriso.info b/libisoburn/trunk/xorriso/xorriso.info index 2e973578..021f92ef 100644 --- a/libisoburn/trunk/xorriso/xorriso.info +++ b/libisoburn/trunk/xorriso/xorriso.info @@ -2245,9 +2245,9 @@ filesystem and announced by an MBR partition table entry. is added. So the value defined here is only in effect if a new ISO image gets written. *partition_hd_cyl=*number gives the number of heads per cylinder - for partition offset. 0 chooses a default value. Maximum is 255. + for the partition table. 0 chooses a default value. Maximum is 255. *partition_sec_hd=*number gives the number of sectors per head for - partition offset. 0 chooses a default value. Maximum is 63. + the partition table. 0 chooses a default value. Maximum is 63. The product partition_sec_hd * partition_hd_cyl * 512 is the cylinder size. It should be divisible by 2048 in order to allow exact alignment. If it is too small to describe the image size by @@ -3177,16 +3177,19 @@ programs trigger comparable actions. -hide-joliet-list, file paths and pathspecs. A lot of options are not supported and lead to failure of the mkisofs emulation. Some are ignored, but better do not rely on this tolerance. - -graft-points is equivalent to -pathspecs on. Note that pathspecs - without "=" are interpreted differently than with xorriso option - -add. Directories get merged with the root directory of the ISO - image, other filetypes get mapped into that root directory. + The supported options are documented in detail in xorrisofs.info + and in man xorrisofs. The description here is focused on the effect + of mkisofs emulation in the context of a xorriso run. Other than with the "cdrecord" personality there is no automatic -commit at the end of a "mkisofs" option list. Verbosity settings -v (= "UPDATE") and -quiet (= "SORRY") persist. The output file, eventually chosen with -o, persists until things happen like -commit, -rollback, -dev, or end of xorriso. -pacifier gets set to "mkisofs" if files are added to the image. + -graft-points is equivalent to -pathspecs on. Note that pathspecs + without "=" are interpreted differently than with xorriso option + -add. Directories get merged with the root directory of the ISO + image, other filetypes get mapped into that root directory. If pathspecs are given and if no output file was chosen before or during the "mkisofs" option list, then standard output (-outdev "-") will get into effect. If -o points to a regular file, then @@ -3247,10 +3250,8 @@ programs trigger comparable actions. The options of genisoimage Jigdo Template Extraction are recognized and performed via xorriso option -jigdo. See the "Alias:" names there for the meaning of the genisoimage options. - --no_rc as first argument prevents interpretation of startup - files. See section FILES below. - Personalites "*xorrisofs*", "*genisoimage*", and "*genisofs*" are + Personalities "*xorrisofs*", "*genisoimage*", and "*genisofs*" are aliases for "mkisofs". If xorriso is started with one of the leafnames "xorrisofs", "genisofs", "mkisofs", or "genisoimage", then it performs @@ -3258,6 +3259,8 @@ programs trigger comparable actions. arguments. I.e. all arguments will be interpreted mkisofs style until "--" is encountered. From then on, options are interpreted as xorriso options. + --no_rc as first argument of such a program start prevents + interpretation of startup files. See section FILES below. Personality "*cdrecord*" accepts the options listed with: -as cdrecord -help -- @@ -3290,6 +3293,8 @@ programs trigger comparable actions. will be interpreted cdrecord style until "--" is encountered and an eventual commit happens. From then on, options are interpreted as xorriso options. + --no_rc as first argument of such a program start prevents + interpretation of xorriso startup files. See section FILES below. -read_mkisofsrc Try one by one to open for reading: ./.mkisofsrc , $MKISOFSRC , @@ -4000,6 +4005,9 @@ File: xorriso.info, Node: Seealso, Next: Legal, Prev: Files, Up: Top 12 See also *********** +For the mkisofs emulation of xorriso + xorrisofs(1) + For mounting xorriso generated ISO 9660 images (-t iso9660) mount(8) @@ -4187,7 +4195,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -out_charset sets output character set: SetWrite. (line 183) * -outdev aquires a drive for output: AqDrive. (line 29) * -overwrite enables overwriting in ISO: SetInsert. (line 127) -* -pacifier controls pacifier text form: Emulation. (line 153) +* -pacifier controls pacifier text form: Emulation. (line 158) * -padding sets amount or mode of image padding: SetWrite. (line 266) * -page set terminal geometry: DialogCtl. (line 19) * -paste_in copies file into disk file: Restore. (line 117) @@ -4207,7 +4215,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -quoted_not_list sets exclusions: SetInsert. (line 72) * -quoted_path_list inserts paths from disk file: Insert. (line 80) * -read_mkisofsrc searches and reads .mkisofsrc file: Emulation. - (line 141) + (line 146) * -reassure enables confirmation question: DialogCtl. (line 32) * -report_about controls verbosity: Exception. (line 55) * -return_with controls exit value: Exception. (line 39) @@ -4217,7 +4225,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -rollback discards pending changes: Writing. (line 9) * -rollback_end ends program without writing: Scripting. (line 125) * -rom_toc_scan searches for sessions: Loading. (line 203) -* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 163) +* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 168) * -scsi_log reports SCSI commands: Scripting. (line 113) * -session_log logs written sessions: Scripting. (line 104) * -session_string composes session info line: Inquiry. (line 56) @@ -4274,11 +4282,11 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Backslash Interpretation, _definition: Processing. (line 49) * Backup, enable fast incremental, -disk_dev_ino: Loading. (line 182) * Backup, enable features, -for_backup: Loading. (line 177) -* Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 163) +* Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 168) * Blank media, _definition: Media. (line 29) * Blind growing, _definition: Methods. (line 40) * Bootability, control, -boot_image: Bootable. (line 26) -* cdrecord, Emulation: Emulation. (line 108) +* cdrecord, Emulation: Emulation. (line 111) * Character Set, _definition: Charset. (line 6) * Character Set, for input, -in_charset: Loading. (line 92) * Character Set, for input/output, -charset: Charset. (line 43) @@ -4317,10 +4325,10 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Drive, write and eject, -commit_eject: Writing. (line 40) * El Torito, _definiton: Extras. (line 19) * Emulation, -as: Emulation. (line 13) -* Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 141) -* Emulation, cdrecord, -as: Emulation. (line 108) +* Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 146) +* Emulation, cdrecord, -as: Emulation. (line 111) * Emulation, mkisofs, -as: Emulation. (line 16) -* Emulation, pacifier form, -pacifier: Emulation. (line 153) +* Emulation, pacifier form, -pacifier: Emulation. (line 158) * Examples: Examples. (line 6) * Filter, _definition: Filter. (line 6) * Filter, apply to file tree, -set_filter_r: Filter. (line 84) @@ -4525,38 +4533,38 @@ Node: Filter79052 Node: Writing83401 Node: SetWrite89690 Node: Bootable103631 -Node: Jigdo116943 -Node: Charset121201 -Node: Exception123952 -Node: DialogCtl128467 -Node: Inquiry131054 -Node: Navigate135431 -Node: Verify143371 -Node: Restore151960 -Node: Emulation158616 -Node: Scripting168091 -Node: Frontend173653 -Node: Examples174948 -Node: ExDevices176117 -Node: ExCreate176751 -Node: ExDialog178025 -Node: ExGrowing179287 -Node: ExModifying180089 -Node: ExBootable180590 -Node: ExCharset181137 -Node: ExPseudo181965 -Node: ExCdrecord182859 -Node: ExMkisofs183174 -Node: ExGrowisofs184177 -Node: ExException185301 -Node: ExTime185755 -Node: ExIncBackup186214 -Node: ExRestore190135 -Node: ExRecovery191104 -Node: Files191670 -Node: Seealso192898 -Node: Legal193422 -Node: CommandIdx194344 -Node: ConceptIdx208651 +Node: Jigdo116949 +Node: Charset121207 +Node: Exception123958 +Node: DialogCtl128473 +Node: Inquiry131060 +Node: Navigate135437 +Node: Verify143377 +Node: Restore151966 +Node: Emulation158622 +Node: Scripting168458 +Node: Frontend174020 +Node: Examples175315 +Node: ExDevices176484 +Node: ExCreate177118 +Node: ExDialog178392 +Node: ExGrowing179654 +Node: ExModifying180456 +Node: ExBootable180957 +Node: ExCharset181504 +Node: ExPseudo182332 +Node: ExCdrecord183226 +Node: ExMkisofs183541 +Node: ExGrowisofs184544 +Node: ExException185668 +Node: ExTime186122 +Node: ExIncBackup186581 +Node: ExRestore190502 +Node: ExRecovery191471 +Node: Files192037 +Node: Seealso193265 +Node: Legal193845 +Node: CommandIdx194767 +Node: ConceptIdx209074  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorriso.texi b/libisoburn/trunk/xorriso/xorriso.texi index 82d50397..ab906df3 100644 --- a/libisoburn/trunk/xorriso/xorriso.texi +++ b/libisoburn/trunk/xorriso/xorriso.texi @@ -44,7 +44,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 "Mar 04, 2011" +@c man .TH XORRISO 1 "Mar 05, 2011" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -2994,10 +2994,10 @@ So the value defined here is only in effect if a new ISO image gets written. @* @cindex Cylinder size, _definiton @strong{partition_hd_cyl=}number gives the number of heads per cylinder for -partition offset. 0 chooses a default value. Maximum is 255. +the partition table. 0 chooses a default value. Maximum is 255. @* @strong{partition_sec_hd=}number gives the number of sectors per head for -partition offset. 0 chooses a default value. Maximum is 63. +the partition table. 0 chooses a default value. Maximum is 63. @* The product partition_sec_hd * partition_hd_cyl * 512 is the cylinder size. It should be divisible by 2048 in order to allow exact alignment. @@ -4221,10 +4221,9 @@ file paths and pathspecs. A lot of options are not supported and lead to failure of the mkisofs emulation. Some are ignored, but better do not rely on this tolerance. @* --graft-points is equivalent to -pathspecs on. Note that pathspecs without "=" -are interpreted differently than with xorriso option -add. Directories get -merged with the root directory of the ISO image, other filetypes get mapped -into that root directory. +The supported options are documented in detail in xorrisofs.info +and in man xorrisofs. The description here is focused on the effect +of mkisofs emulation in the context of a xorriso run. @* Other than with the "cdrecord" personality there is no automatic -commit at the end of a "mkisofs" option list. Verbosity settings -v (= "UPDATE") and @@ -4232,6 +4231,11 @@ the end of a "mkisofs" option list. Verbosity settings -v (= "UPDATE") and persists until things happen like -commit, -rollback, -dev, or end of xorriso. -pacifier gets set to "mkisofs" if files are added to the image. @* +-graft-points is equivalent to -pathspecs on. Note that pathspecs without "=" +are interpreted differently than with xorriso option -add. Directories get +merged with the root directory of the ISO image, other filetypes get mapped +into that root directory. +@* If pathspecs are given and if no output file was chosen before or during the "mkisofs" option list, then standard output (-outdev "-") will get into effect. If -o points to a regular file, then it will be truncated to 0 bytes @@ -4313,12 +4317,9 @@ The options of genisoimage Jigdo Template Extraction are recognized and performed via xorriso option -jigdo. See the "Alias:" names there for the meaning of the genisoimage options. @* -@minus{}@minus{}no_rc as first argument prevents interpretation of -startup files. See section FILES below. -@* @sp 1 -Personalites "@strong{xorrisofs}", "@strong{genisoimage}", +Personalities "@strong{xorrisofs}", "@strong{genisoimage}", and "@strong{genisofs}" are aliases for "mkisofs". @* If xorriso is started with one of the leafnames "xorrisofs", "genisofs", @@ -4328,6 +4329,9 @@ I.e. all arguments will be interpreted mkisofs style until "@minus{}@minus{}" is encountered. From then on, options are interpreted as xorriso options. @* +@minus{}@minus{}no_rc as first argument of such a program start +prevents interpretation of startup files. See section FILES below. +@* @sp 1 @cindex Emulation, cdrecord, -as @@ -4373,6 +4377,9 @@ If xorriso is started with one of the leafnames "xorrecord", "cdrskin", to the command line arguments. I.e. all arguments will be interpreted cdrecord style until "@minus{}@minus{}" is encountered and an eventual commit happens. From then on, options are interpreted as xorriso options. +@* +@minus{}@minus{}no_rc as first argument of such a program start +prevents interpretation of xorriso startup files. See section FILES below. @c man .TP @item -read_mkisofsrc @kindex -read_mkisofsrc searches and reads .mkisofsrc file @@ -5369,6 +5376,9 @@ The default setting of -check_media abort_file= is: @* @c man .SH SEE ALSO @c man .TP +@c man For the mkisofs emulation of xorriso +@c man .BR xorrisofs(1) +@c man .TP @c man For mounting xorriso generated ISO 9660 images (-t iso9660) @c man .BR mount(8) @c man .TP @@ -5397,6 +5407,8 @@ The default setting of -check_media abort_file= is: @node Seealso, Legal, Files, Top @chapter See also @table @asis +@item For the mkisofs emulation of xorriso +xorrisofs(1) @item For mounting xorriso generated ISO 9660 images (-t iso9660) mount(8) @item Libreadline, a comfortable input line facility