libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New -as mkisofs option --boot-catalog-hide

Browse Source
This commit is contained in:
Thomas Schmitt 2010-06-24 08:49:04 +00:00
parent 8ca94b2cfd
commit 7b35fafb8d
5 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libisoburn/trunk/xorriso/emulators.c
View File

@ -611,6 +611,7 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag)
" --efi-boot FILE Set El Torito EFI boot image name and type", " --efi-boot FILE Set El Torito EFI boot image name and type",
" -c FILE, -eltorito-catalog FILE", " -c FILE, -eltorito-catalog FILE",
" Set El Torito boot catalog name", " Set El Torito boot catalog name",
" --boot-catalog-hide Hide boot catalog from ISO9660/RR and Joliet",
" -boot-load-size # Set numbers of load sectors", " -boot-load-size # Set numbers of load sectors",
" -no-emul-boot Boot image is 'no emulation' image", " -no-emul-boot Boot image is 'no emulation' image",
" -boot-info-table Patch boot image with info table", " -boot-info-table Patch boot image with info table",
@ -1098,7 +1099,8 @@ not_enough_args:;
strcmp(argv[i], "-boot-info-table")==0 || strcmp(argv[i], "-boot-info-table")==0 ||
strncmp(argv[i], "isolinux_mbr=", 13)==0 || strncmp(argv[i], "isolinux_mbr=", 13)==0 ||
strcmp(argv[i], "-eltorito-alt-boot")==0 || strcmp(argv[i], "-eltorito-alt-boot")==0 ||
strcmp(argv[i], "--protective-msdos-label")==0) { strcmp(argv[i], "--protective-msdos-label")==0 ||
strcmp(argv[i], "--boot-catalog-hide")==0) {
delay_opt_list[delay_opt_count++]= i; delay_opt_list[delay_opt_count++]= i;
} else if(strcmp(argv[i], "-b") == 0 || } else if(strcmp(argv[i], "-b") == 0 ||
strcmp(argv[i], "-eltorito-boot") == 0 || strcmp(argv[i], "-eltorito-boot") == 0 ||
@ -1331,6 +1333,8 @@ problem_handler_2:;
xorriso->system_area_options= (xorriso->system_area_options & ~3) | 2; xorriso->system_area_options= (xorriso->system_area_options & ~3) | 2;
} else if(strcmp(argv[i], "--protective-msdos-label")==0) { } else if(strcmp(argv[i], "--protective-msdos-label")==0) {
xorriso->system_area_options= (xorriso->system_area_options & ~3) | 1; xorriso->system_area_options= (xorriso->system_area_options & ~3) | 1;
} else if(strcmp(argv[i], "--boot-catalog-hide")==0) {
xorriso->boot_image_cat_hidden|= 3;
} }
continue; /* regular bottom of loop */ continue; /* regular bottom of loop */
problem_handler_boot:; problem_handler_boot:;

7
libisoburn/trunk/xorriso/xorriso.1
View File

@ -9,7 +9,7 @@
.\" First parameter, NAME, should be all caps .\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1) .\" other parameters are allowed: see man(7), man(1)
.TH XORRISO 1 "Jun 20, 2010" .TH XORRISO 1 "Jun 24, 2010"
.\" Please adjust this date whenever revising the manpage. .\" Please adjust this date whenever revising the manpage.
.\" .\"
.\" Some roff macros, for reference: .\" Some roff macros, for reference:
@ -3187,7 +3187,8 @@ Personality "\fBmkisofs\fR" accepts the options listed with:
Among them: -R (always on), -r, -J, -o, -M, -C, -path-list, -m, -exclude-list, Among them: -R (always on), -r, -J, -o, -M, -C, -path-list, -m, -exclude-list,
-f, -print-size, -pad, -no-pad, -V, -v, -version, -graft-points, -z, -f, -print-size, -pad, -no-pad, -V, -v, -version, -graft-points, -z,
-no-emul-boot, -b, -c, -boot-info-table, -boot-load-size, -input-charset, -G, -no-emul-boot, -b, -c, -boot-info-table, -boot-load-size, -input-charset, -G,
-output-charset, -U, pathspecs as with xorriso -add. -output-charset, -U, -hide, -hide-joliet, -hide-list, -hide-joliet-list,
file paths and pathspecs.
A lot of options are not supported and lead to failure of the mkisofs 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. emulation. Some are ignored, but better do not rely on this tolerance.
.br .br
@ -3237,6 +3238,8 @@ 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 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. instead of -G to apply the effect of -boot_image isolinux partition_table=on.
.br .br
--boot-catalog-hide is -boot_image any cat_hidden=on.
.br
Personalites "\fBxorrisofs\fR", "\fBgenisoimage\fR", Personalites "\fBxorrisofs\fR", "\fBgenisoimage\fR",
and "\fBgenisofs\fR" are aliases for "mkisofs". and "\fBgenisofs\fR" are aliases for "mkisofs".
.br .br

70
libisoburn/trunk/xorriso/xorriso.info
View File

@ -2850,10 +2850,11 @@ programs trigger comparable actions.
Among them: -R (always on), -r, -J, -o, -M, -C, -path-list, -m, Among them: -R (always on), -r, -J, -o, -M, -C, -path-list, -m,
-exclude-list, -f, -print-size, -pad, -no-pad, -V, -v, -version, -exclude-list, -f, -print-size, -pad, -no-pad, -V, -v, -version,
-graft-points, -z, -no-emul-boot, -b, -c, -boot-info-table, -graft-points, -z, -no-emul-boot, -b, -c, -boot-info-table,
-boot-load-size, -input-charset, -G, -output-charset, -U, -boot-load-size, -input-charset, -G, -output-charset, -U, -hide,
pathspecs as with xorriso -add. A lot of options are not -hide-joliet, -hide-list, -hide-joliet-list, file paths and
supported and lead to failure of the mkisofs emulation. Some are pathspecs. A lot of options are not supported and lead to failure
ignored, but better do not rely on this tolerance. 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 -graft-points is equivalent to -pathspecs on. Note that pathspecs
without "=" are interpreted differently than with xorriso option without "=" are interpreted differently than with xorriso option
-add. Directories get merged with the root directory of the ISO -add. Directories get merged with the root directory of the ISO
@ -2892,6 +2893,7 @@ programs trigger comparable actions.
where FILE is one of the Syslinux files mbr/isohdp[fp]x*.bin . Use 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 this instead of -G to apply the effect of -boot_image isolinux
partition_table=on. partition_table=on.
-boot-catalog-hide is -boot_image any cat_hidden=on.
Personalites "*xorrisofs*", "*genisoimage*", and "*genisofs*" are Personalites "*xorrisofs*", "*genisoimage*", and "*genisofs*" are
aliases for "mkisofs". aliases for "mkisofs".
If xorriso is started with one of the leafnames "xorrisofs", If xorriso is started with one of the leafnames "xorrisofs",
@ -3793,7 +3795,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -out_charset sets output character set: SetWrite. (line 122) * -out_charset sets output character set: SetWrite. (line 122)
* -outdev aquires a drive for output: AqDrive. (line 29) * -outdev aquires a drive for output: AqDrive. (line 29)
* -overwrite enables overwriting in ISO: SetInsert. (line 127) * -overwrite enables overwriting in ISO: SetInsert. (line 127)
* -pacifier controls pacifier text form: Emulation. (line 105) * -pacifier controls pacifier text form: Emulation. (line 107)
* -padding sets amount of image padding: SetWrite. (line 205) * -padding sets amount of image padding: SetWrite. (line 205)
* -page set terminal geometry: DialogCtl. (line 15) * -page set terminal geometry: DialogCtl. (line 15)
* -paste_in copies file into disk file: Restore. (line 117) * -paste_in copies file into disk file: Restore. (line 117)
@ -3820,7 +3822,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -rollback discards pending changes: Writing. (line 9) * -rollback discards pending changes: Writing. (line 9)
* -rollback_end ends program without writing: Scripting. (line 125) * -rollback_end ends program without writing: Scripting. (line 125)
* -rom_toc_scan searches for sessions: Loading. (line 184) * -rom_toc_scan searches for sessions: Loading. (line 184)
* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 115) * -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 117)
* -scsi_log reports SCSI commands: Scripting. (line 113) * -scsi_log reports SCSI commands: Scripting. (line 113)
* -session_log logs written sessions: Scripting. (line 104) * -session_log logs written sessions: Scripting. (line 104)
* -session_string composes session info line: Inquiry. (line 56) * -session_string composes session info line: Inquiry. (line 56)
@ -3876,11 +3878,11 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Backslash Interpretation, _definition: Processing. (line 49) * Backslash Interpretation, _definition: Processing. (line 49)
* Backup, enable fast incremental, -disk_dev_ino: Loading. (line 163) * Backup, enable fast incremental, -disk_dev_ino: Loading. (line 163)
* Backup, enable features, -for_backup: Loading. (line 158) * Backup, enable features, -for_backup: Loading. (line 158)
* Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 115) * Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 117)
* Blank media, _definition: Media. (line 25) * Blank media, _definition: Media. (line 25)
* Blind growing, _definition: Methods. (line 40) * Blind growing, _definition: Methods. (line 40)
* Bootability, control, -boot_image: Bootable. (line 20) * Bootability, control, -boot_image: Bootable. (line 20)
* cdrecord, Emulation: Emulation. (line 72) * cdrecord, Emulation: Emulation. (line 74)
* Character Set, _definition: Charset. (line 6) * Character Set, _definition: Charset. (line 6)
* Character Set, for input, -in_charset: Loading. (line 73) * Character Set, for input, -in_charset: Loading. (line 73)
* Character Set, for input/output, -charset: Charset. (line 43) * Character Set, for input/output, -charset: Charset. (line 43)
@ -3915,9 +3917,9 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Drive, write and eject, -commit_eject: Writing. (line 40) * Drive, write and eject, -commit_eject: Writing. (line 40)
* El Torito, _definiton: Extras. (line 19) * El Torito, _definiton: Extras. (line 19)
* Emulation, -as: Emulation. (line 13) * Emulation, -as: Emulation. (line 13)
* Emulation, cdrecord, -as: Emulation. (line 72) * Emulation, cdrecord, -as: Emulation. (line 74)
* Emulation, mkisofs, -as: Emulation. (line 16) * Emulation, mkisofs, -as: Emulation. (line 16)
* Emulation, pacifier form, -pacifier: Emulation. (line 105) * Emulation, pacifier form, -pacifier: Emulation. (line 107)
* Examples: Examples. (line 6) * Examples: Examples. (line 6)
* Filter, _definition: Filter. (line 6) * Filter, _definition: Filter. (line 6)
* Filter, apply to file tree, -set_filter_r: Filter. (line 84) * Filter, apply to file tree, -set_filter_r: Filter. (line 84)
@ -4119,29 +4121,29 @@ Node: Navigate117760
Node: Verify125481 Node: Verify125481
Node: Restore133901 Node: Restore133901
Node: Emulation140557 Node: Emulation140557
Node: Scripting147430 Node: Scripting147539
Node: Frontend152992 Node: Frontend153101
Node: Examples154193 Node: Examples154302
Node: ExDevices155362 Node: ExDevices155471
Node: ExCreate155996 Node: ExCreate156105
Node: ExDialog157270 Node: ExDialog157379
Node: ExGrowing158532 Node: ExGrowing158641
Node: ExModifying159334 Node: ExModifying159443
Node: ExBootable159835 Node: ExBootable159944
Node: ExCharset160382 Node: ExCharset160491
Node: ExPseudo161210 Node: ExPseudo161319
Node: ExCdrecord162104 Node: ExCdrecord162213
Node: ExMkisofs162419 Node: ExMkisofs162528
Node: ExGrowisofs163422 Node: ExGrowisofs163531
Node: ExException164546 Node: ExException164655
Node: ExTime165000 Node: ExTime165109
Node: ExIncBackup165459 Node: ExIncBackup165568
Node: ExRestore168931 Node: ExRestore169040
Node: ExRecovery169900 Node: ExRecovery170009
Node: Files170466 Node: Files170575
Node: Seealso171504 Node: Seealso171613
Node: Legal172028 Node: Legal172137
Node: CommandIdx172950 Node: CommandIdx173059
Node: ConceptIdx186324 Node: ConceptIdx186433
 
End Tag Table End Tag Table

4
libisoburn/trunk/xorriso/xorriso.texi
View File

@ -44,7 +44,7 @@
@c man .\" First parameter, NAME, should be all caps @c man .\" First parameter, NAME, should be all caps
@c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @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 .\" other parameters are allowed: see man(7), man(1)
@c man .TH XORRISO 1 "Jun 23, 2010" @c man .TH XORRISO 1 "Jun 24, 2010"
@c man .\" Please adjust this date whenever revising the manpage. @c man .\" Please adjust this date whenever revising the manpage.
@c man .\" @c man .\"
@c man .\" Some roff macros, for reference: @c man .\" Some roff macros, for reference:
@ -3866,6 +3866,8 @@ 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 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. instead of -G to apply the effect of -boot_image isolinux partition_table=on.
@* @*
--boot-catalog-hide is -boot_image any cat_hidden=on.
@*
Personalites "@strong{xorrisofs}", "@strong{genisoimage}", Personalites "@strong{xorrisofs}", "@strong{genisoimage}",
and "@strong{genisofs}" are aliases for "mkisofs". and "@strong{genisofs}" are aliases for "mkisofs".
@* @*

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2010.06.23.175613" #define Xorriso_timestamP "2010.06.24.084800"