From 3a7ed06a68fef286065fbc59ef73ae1ecd990dc8 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 12 Apr 2010 11:09:38 +0000 Subject: [PATCH] Mentioned xorriso alias names in chapter FILES of documentation --- libisoburn/trunk/xorriso/xorriso.1 | 32 +++++- libisoburn/trunk/xorriso/xorriso.info | 153 +++++++++++++++----------- libisoburn/trunk/xorriso/xorriso.texi | 23 +++- 3 files changed, 136 insertions(+), 72 deletions(-) diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1 index 17997359..8fb853ad 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 "Apr 07, 2010" +.TH XORRISO 1 "Apr 12, 2010" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -2233,9 +2233,18 @@ which can be used to boot from USB stick or hard disk. Other than a El Torito boot image, the file disk_path needs not to be added to the ISO image. .br +-boot_image isolinux system_area= implies "partition_table=on". +.br "partition_table=on" causes a simple partition table to be written into bytes -446 to 511 of the System Area. It shows a single partiton which starts at -byte 512 and ends where the ISO image ends. +446 to 511 of the System Area. +.br +With type "isolinux" it shows a partition that begins at byte 0 and it causes +the boot image LBA to be written into the MBR. This works only if also +"system_area=" and "bin_path=" or "dir=" is given. +.br +With types "any" and "grub" it shows a single +partiton which starts at byte 512 and ends where the ISO image ends. +This works with or without system_area= or boot image. .br .TP .B Character sets: @@ -3109,6 +3118,10 @@ Adopted from grub-mkisofs are --protective-msdos-label --modification-date=YYYYMMDDhhmmsscc (see -volume_date uuid). .br +For MBR bootable ISOLINUX images there is -isohybrid-mbr FILE, where +FILE is one of the Syslinux files mbr/isohdp[fp]x*.bin . Use this +instead of -G to apply the effect of -boot_image isolinux partition_table=on. +.br Personalites "\fBxorrisofs\fR", "\fBgenisoimage\fR", and "\fBgenisofs\fR" are aliases for "mkisofs". .br @@ -3859,6 +3872,19 @@ addresses which can be used on "$HOME"/dvd_copy with mount option -o sbsector= resp. -s. .SH FILES .SS +.B Program alias names: +.br +Normal installation of xorriso creates three links or copies which by their +program name pre-select certain settings: +.br +\fBxorrisofs\fR starts xorriso with -as mkisofs emulation. +.br +\fBxorrecord\fR starts xorriso with -as cdrecord emulation. +.br +\fBosirrox\fR starts with -osirrox "on:o_excl_off" which allows +to copy files from ISO image to disk and to apply option -mount to +one or more of the existing ISO sessions. +.SS .B Startup files: .br If not -no_rc is given as the first argument then xorriso attempts on startup diff --git a/libisoburn/trunk/xorriso/xorriso.info b/libisoburn/trunk/xorriso/xorriso.info index 76c4d9bc..1f380446 100644 --- a/libisoburn/trunk/xorriso/xorriso.info +++ b/libisoburn/trunk/xorriso/xorriso.info @@ -1,5 +1,5 @@ -This is xorriso/xorriso.info, produced by makeinfo version 4.8 from -./xorriso/xorriso.texi. +This is xorriso.info, produced by makeinfo version 4.8 from +./xorriso.texi. INFO-DIR-SECTION Archiving START-INFO-DIR-ENTRY @@ -1993,10 +1993,16 @@ of the existing sessions, unless one can assume overwriteable media. be used to boot from USB stick or hard disk. 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". "partition_table=on" causes a simple partition table to be written - into bytes 446 to 511 of the System Area. It shows a single - partiton which starts at byte 512 and ends where the ISO image - ends. + into bytes 446 to 511 of the System Area. + With type "isolinux" it shows a partition that begins at byte 0 + and it causes the boot image LBA to be written into the MBR. This + works only if also "system_area=" and "bin_path=" or "dir=" is + given. + With types "any" and "grub" it shows a single partiton which + starts at byte 512 and ends where the ISO image ends. This works + with or without system_area= or boot image.  File: xorriso.info, Node: Charset, Next: Exception, Prev: Bootable, Up: Options @@ -2788,6 +2794,10 @@ programs trigger comparable actions. Adopted from grub-mkisofs are --protective-msdos-label (see -boot_image grub partition_table=on) and --modification-date=YYYYMMDDhhmmsscc (see -volume_date uuid). + For MBR bootable ISOLINUX images there is -isohybrid-mbr FILE, + where FILE is one of the Syslinux files mbr/isohdp[fp]x*.bin . Use + this instead of -G to apply the effect of -boot_image isolinux + partition_table=on. Personalites "*xorrisofs*", "*genisoimage*", and "*genisofs*" are aliases for "mkisofs". If xorriso is started with one of the leafnames "xorrisofs", @@ -3465,13 +3475,26 @@ This can be repeated several times, eventually with -eject or with other -indev drives. See the human readable part of "$HOME"/dvd_copy.map for addresses which can be used on "$HOME"/dvd_copy with mount option -o sbsector= resp. -s. +  File: xorriso.info, Node: Files, Next: Seealso, Prev: Examples, Up: Top 11 Files ******** -11.1 Startup Files +11.1 Program Alias Names +======================== + +Normal installation of xorriso creates three links or copies which by +their program name pre-select certain settings: + +*xorrisofs* starts xorriso with -as mkisofs emulation. +*xorrecord* starts xorriso with -as cdrecord emulation. +*osirrox* starts with -osirrox "on:o_excl_off" which allows to copy +files from ISO image to disk and to apply option -mount to one or more +of the existing ISO sessions. + +11.2 Startup Files ================== If not -no_rc is given as the first argument then xorriso attempts on @@ -3485,7 +3508,7 @@ $HOME/.xorrisorc The files are read in the sequence given above, but none of them is required to exist. -11.2 Runtime control files +11.3 Runtime control files ========================== The default setting of -check_media abort_file= is: @@ -3673,7 +3696,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -out_charset sets output character set: SetWrite. (line 114) * -outdev aquires a drive for output: AqDrive. (line 29) * -overwrite enables overwriting in ISO: SetInsert. (line 127) -* -pacifier controls pacifier text form: Emulation. (line 95) +* -pacifier controls pacifier text form: Emulation. (line 99) * -padding sets amount of image padding: SetWrite. (line 197) * -page set terminal geometry: DialogCtl. (line 15) * -paste_in copies file into disk file: Restore. (line 117) @@ -3700,7 +3723,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 189) -* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 105) +* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 109) * -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) @@ -3756,11 +3779,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 168) * Backup, enable features, -for_backup: Loading. (line 163) -* Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 105) +* Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 109) * Blank media, _definition: Media. (line 25) * Blind growing, _definition: Methods. (line 40) * Bootability, control, -boot_image: Bootable. (line 20) -* cdrecord, Emulation: Emulation. (line 62) +* cdrecord, Emulation: Emulation. (line 66) * Character Set, _definition: Charset. (line 6) * Character Set, for input, -in_charset: Loading. (line 73) * Character Set, for input/output, -charset: Charset. (line 43) @@ -3795,9 +3818,9 @@ 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, cdrecord, -as: Emulation. (line 62) +* Emulation, cdrecord, -as: Emulation. (line 66) * Emulation, mkisofs, -as: Emulation. (line 16) -* Emulation, pacifier form, -pacifier: Emulation. (line 95) +* Emulation, pacifier form, -pacifier: Emulation. (line 99) * Examples: Examples. (line 6) * Filter, _definition: Filter. (line 6) * Filter, apply to file tree, -set_filter_r: Filter. (line 84) @@ -3966,57 +3989,57 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top  Tag Table: -Node: Top436 -Node: Overview1340 -Node: Model3217 -Node: Media6097 -Node: Methods8527 -Node: Drives11074 -Node: Extras14340 -Node: Processing17471 -Node: Dialog20967 -Node: Options22624 -Node: AqDrive24192 -Node: Loading27098 -Node: Insert39533 -Node: SetInsert47890 -Node: Manip56457 -Node: CmdFind64333 -Node: Filter73162 -Node: Writing77511 -Node: SetWrite83800 -Node: Bootable93711 -Node: Charset98838 -Node: Exception101592 -Node: DialogCtl106107 -Node: Inquiry108452 -Node: Navigate112592 -Node: Verify119946 -Node: Restore128366 -Node: Emulation135022 -Node: Scripting141234 -Node: Frontend146796 -Node: Examples147997 -Node: ExDevices149166 -Node: ExCreate149648 -Node: ExDialog150922 -Node: ExGrowing152184 -Node: ExModifying152986 -Node: ExBootable153487 -Node: ExCharset154034 -Node: ExPseudo154862 -Node: ExCdrecord155756 -Node: ExMkisofs156071 -Node: ExGrowisofs157074 -Node: ExException158198 -Node: ExTime158652 -Node: ExIncBackup159111 -Node: ExRestore162583 -Node: ExRecovery163552 -Node: Files164117 -Node: Seealso164704 -Node: Legal165228 -Node: CommandIdx166150 -Node: ConceptIdx179451 +Node: Top420 +Node: Overview1324 +Node: Model3201 +Node: Media6081 +Node: Methods8511 +Node: Drives11058 +Node: Extras14324 +Node: Processing17455 +Node: Dialog20951 +Node: Options22608 +Node: AqDrive24176 +Node: Loading27082 +Node: Insert39517 +Node: SetInsert47874 +Node: Manip56441 +Node: CmdFind64317 +Node: Filter73146 +Node: Writing77495 +Node: SetWrite83784 +Node: Bootable93695 +Node: Charset99200 +Node: Exception101954 +Node: DialogCtl106469 +Node: Inquiry108814 +Node: Navigate112954 +Node: Verify120308 +Node: Restore128728 +Node: Emulation135384 +Node: Scripting141829 +Node: Frontend147391 +Node: Examples148592 +Node: ExDevices149761 +Node: ExCreate150243 +Node: ExDialog151517 +Node: ExGrowing152779 +Node: ExModifying153581 +Node: ExBootable154082 +Node: ExCharset154629 +Node: ExPseudo155457 +Node: ExCdrecord156351 +Node: ExMkisofs156666 +Node: ExGrowisofs157669 +Node: ExException158793 +Node: ExTime159247 +Node: ExIncBackup159706 +Node: ExRestore163178 +Node: ExRecovery164147 +Node: Files164713 +Node: Seealso165751 +Node: Legal166275 +Node: CommandIdx167197 +Node: ConceptIdx180498  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorriso.texi b/libisoburn/trunk/xorriso/xorriso.texi index 17fe7994..4dad3f2b 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 "Apr 10, 2010" +@c man .TH XORRISO 1 "Apr 12, 2010" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -4721,12 +4721,27 @@ This can be repeated several times, eventually with -eject or with other addresses which can be used on "$HOME"/dvd_copy with mount option -o sbsector= resp. -s. @c man .SH FILES -@c man .SS -@c man .B Startup files: -@* @node Files, Seealso, Examples, Top @chapter Files +@c man .SS +@c man .B Program alias names: +@* +@section Program Alias Names +Normal installation of xorriso creates three links or copies which by their +program name pre-select certain settings: +@* +@sp 1 +@strong{xorrisofs} starts xorriso with -as mkisofs emulation. +@* +@strong{xorrecord} starts xorriso with -as cdrecord emulation. +@* +@strong{osirrox} starts with -osirrox "on:o_excl_off" which allows +to copy files from ISO image to disk and to apply option -mount to +one or more of the existing ISO sessions. +@c man .SS +@c man .B Startup files: @section Startup Files +@* If not -no_rc is given as the first argument then xorriso attempts on startup to read and execute lines from the following files: @*