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

New -as mkisofs option -e from Fedora genisoimage

Browse Source
This commit is contained in:
Thomas Schmitt 2010-08-18 10:33:04 +00:00
parent dfbac5e3aa
commit 5044f962b9
5 changed files with 91 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -560,7 +560,7 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv,
"-jigdo-jigdo", "-jigdo-template", "-jigdo-min-file-size",
"-jigdo-force-md5", "-jigdo-exclude", "-jigdo-map", "-md5-list",
"--stdio_sync", "--quoted_path_list", "--efi-boot", "--embedded-boot",
"-isohybrid-mbr",
"-isohybrid-mbr", "-e",
""
};
static char arg2_options[][41]= {
@ -646,8 +646,8 @@ int Xorriso_genisofs_add_boot(struct XorrisO *xorriso, char *whom,
if(*option_b && !*no_emul_boot) {
xorriso->boot_image_bin_path[0]= 0;
sprintf(xorriso->info_text,
"-as %s: Option -b is supported only if option -no-emul-boot is given",
whom);
"-as %s: Option -%s is supported only if option -no-emul-boot is given",
whom, (xorriso->boot_platform_id == 0xef ? "e" : "b"));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0);
}
@ -719,6 +719,7 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag)
" Set El Torito boot image name",
" -eltorito-alt-boot Start specifying alternative El Torito boot parameters",
" --efi-boot FILE Set El Torito EFI boot image name and type",
" -e FILE Set EFI boot image name (more rawly)",
" -c FILE, -eltorito-catalog FILE",
" Set El Torito boot catalog name",
" --boot-catalog-hide Hide boot catalog from ISO9660/RR and Joliet",
@ -1219,6 +1220,7 @@ not_enough_args:;
} else if(strcmp(argv[i], "-b") == 0 ||
strcmp(argv[i], "-eltorito-boot") == 0 ||
strcmp(argv[i], "--efi-boot") == 0 ||
strcmp(argv[i], "-e") == 0 ||
strcmp(argv[i], "-c") == 0 ||
strcmp(argv[i], "-eltorito-catalog") == 0 ||
strcmp(argv[i], "-boot-load-size") == 0 ||
@ -1414,7 +1416,8 @@ problem_handler_2:;
xorriso->patch_isolinux_image= 1;
} else if(strcmp(argv[i], "-b") == 0 ||
strcmp(argv[i], "-eltorito-boot") == 0 ||
strcmp(argv[i], "--efi-boot") == 0) {
strcmp(argv[i], "--efi-boot") == 0 ||
strcmp(argv[i], "-e") == 0) {
i++;
if(strcmp(argv[i - 1], "--efi-boot") == 0) {
if(xorriso->boot_image_bin_path[0]) {
@ -1427,7 +1430,10 @@ problem_handler_2:;
xorriso->boot_efi_default= 1;
} else {
boot_path= xorriso->boot_image_bin_path;
xorriso->boot_platform_id= 0x00;
if(strcmp(argv[i - 1], "-e") == 0)
xorriso->boot_platform_id= 0xef;
else
xorriso->boot_platform_id= 0x00;
xorriso->boot_efi_default= 0;
option_b= 1;
}

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

@ -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 "Jun 27, 2010"
.TH XORRISO 1 "Jul 30, 2010"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@ -3267,8 +3267,12 @@ of all regular files underneath directory iso_rr_path.
Adopted from grub-mkisofs are --protective-msdos-label
(see -boot_image grub partition_table=on) and
--modification-date=YYYYMMDDhhmmsscc
(see -volume_date uuid). For EFI bootable GRUB boot images use --efi-boot.
It performs -boot_image grub efi_path= surrounded by two -boot_image any next.
(see -volume_date uuid). For EFI bootable GRUB boot images use
--efi-boot.
It performs -boot_image grub efi_path= surrounded by two
-boot_image "any" "next".
Alternative option -e from Fedora genisoimage sets bin_path and
platform_id for EFI, but performs no "next".
.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

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

@ -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
@ -2920,8 +2920,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
EFI bootable GRUB boot images use -efi-boot. It performs
-boot_image grub efi_path= surrounded by two -boot_image any next.
EFI bootable GRUB boot images use --efi-boot. It performs
-boot_image grub efi_path= surrounded by two -boot_image "any"
"next". Alternative option -e from Fedora genisoimage sets
bin_path and platform_id for EFI, but performs no "next".
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
@ -3846,7 +3848,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -out_charset sets output character set: SetWrite. (line 156)
* -outdev aquires a drive for output: AqDrive. (line 29)
* -overwrite enables overwriting in ISO: SetInsert. (line 127)
* -pacifier controls pacifier text form: Emulation. (line 119)
* -pacifier controls pacifier text form: Emulation. (line 121)
* -padding sets amount of image padding: SetWrite. (line 239)
* -page set terminal geometry: DialogCtl. (line 15)
* -paste_in copies file into disk file: Restore. (line 117)
@ -3866,7 +3868,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 107)
(line 109)
* -reassure enables confirmation question: DialogCtl. (line 28)
* -report_about controls verbosity: Exception. (line 55)
* -return_with controls exit value: Exception. (line 39)
@ -3876,7 +3878,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 184)
* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 129)
* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 131)
* -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)
@ -3932,11 +3934,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 163)
* Backup, enable features, -for_backup: Loading. (line 158)
* Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 129)
* Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 131)
* Blank media, _definition: Media. (line 25)
* Blind growing, _definition: Methods. (line 40)
* Bootability, control, -boot_image: Bootable. (line 20)
* cdrecord, Emulation: Emulation. (line 74)
* cdrecord, Emulation: Emulation. (line 76)
* Character Set, _definition: Charset. (line 6)
* Character Set, for input, -in_charset: Loading. (line 73)
* Character Set, for input/output, -charset: Charset. (line 43)
@ -3971,10 +3973,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 107)
* Emulation, cdrecord, -as: Emulation. (line 74)
* Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 109)
* Emulation, cdrecord, -as: Emulation. (line 76)
* Emulation, mkisofs, -as: Emulation. (line 16)
* Emulation, pacifier form, -pacifier: Emulation. (line 119)
* Emulation, pacifier form, -pacifier: Emulation. (line 121)
* Examples: Examples. (line 6)
* Filter, _definition: Filter. (line 6)
* Filter, apply to file tree, -set_filter_r: Filter. (line 84)
@ -4152,57 +4154,57 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top

Tag Table:
Node: Top436
Node: Overview1340
Node: Model3225
Node: Media6105
Node: Methods8535
Node: Drives11082
Node: Extras14388
Node: Processing17815
Node: Dialog21311
Node: Options22968
Node: AqDrive24536
Node: Loading27442
Node: Insert39621
Node: SetInsert47978
Node: Manip56545
Node: CmdFind65226
Node: Filter75177
Node: Writing79526
Node: SetWrite85815
Node: Bootable97764
Node: Charset105716
Node: Exception108470
Node: DialogCtl112985
Node: Inquiry115330
Node: Navigate119460
Node: Verify127058
Node: Restore135478
Node: Emulation142134
Node: Scripting149732
Node: Frontend155294
Node: Examples156495
Node: ExDevices157664
Node: ExCreate158298
Node: ExDialog159572
Node: ExGrowing160834
Node: ExModifying161636
Node: ExBootable162137
Node: ExCharset162684
Node: ExPseudo163512
Node: ExCdrecord164406
Node: ExMkisofs164721
Node: ExGrowisofs165724
Node: ExException166848
Node: ExTime167302
Node: ExIncBackup167761
Node: ExRestore171233
Node: ExRecovery172202
Node: Files172768
Node: Seealso173996
Node: Legal174520
Node: CommandIdx175442
Node: ConceptIdx189248
Node: Top420
Node: Overview1324
Node: Model3209
Node: Media6089
Node: Methods8519
Node: Drives11066
Node: Extras14372
Node: Processing17799
Node: Dialog21295
Node: Options22952
Node: AqDrive24520
Node: Loading27426
Node: Insert39605
Node: SetInsert47962
Node: Manip56529
Node: CmdFind65210
Node: Filter75161
Node: Writing79510
Node: SetWrite85799
Node: Bootable97748
Node: Charset105700
Node: Exception108454
Node: DialogCtl112969
Node: Inquiry115314
Node: Navigate119444
Node: Verify127042
Node: Restore135462
Node: Emulation142118
Node: Scripting149841
Node: Frontend155403
Node: Examples156604
Node: ExDevices157773
Node: ExCreate158407
Node: ExDialog159681
Node: ExGrowing160943
Node: ExModifying161745
Node: ExBootable162246
Node: ExCharset162793
Node: ExPseudo163621
Node: ExCdrecord164515
Node: ExMkisofs164830
Node: ExGrowisofs165833
Node: ExException166957
Node: ExTime167411
Node: ExIncBackup167870
Node: ExRestore171342
Node: ExRecovery172311
Node: Files172877
Node: Seealso174105
Node: Legal174629
Node: CommandIdx175551
Node: ConceptIdx189357

End Tag Table

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

@ -3903,8 +3903,12 @@ of all regular files underneath directory iso_rr_path.
Adopted from grub-mkisofs are @minus{}@minus{}protective-msdos-label
(see -boot_image grub partition_table=on) and
@minus{}@minus{}modification-date=YYYYMMDDhhmmsscc
(see -volume_date uuid). For EFI bootable GRUB boot images use --efi-boot.
It performs -boot_image grub efi_path= surrounded by two -boot_image any next.
(see -volume_date uuid). For EFI bootable GRUB boot images use
@minus{}@minus{}efi-boot.
It performs @minus{}boot_image grub efi_path= surrounded by two
@minus{}boot_image "any" "next".
Alternative option @minus{}e from Fedora genisoimage sets bin_path and
platform_id for EFI, but performs no "next".
@*
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

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

@ -1 +1 @@
#define Xorriso_timestamP "2010.08.09.092037"
#define Xorriso_timestamP "2010.08.18.102709"