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

New -boot_image specifier emul_type=none|hard_disk|floppy

This commit is contained in:
Thomas Schmitt 2010-08-18 18:17:14 +00:00
parent 5044f962b9
commit def73a0e8f
6 changed files with 88 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libisoburn/trunk/xorriso/opts_a_c.c
View File

@ -805,6 +805,23 @@ treatment_patch:;
}
xorriso->boot_platform_id= u;
} else if(strncmp(treatpt, "emul_type=", 10)==0) {
if(strcmp(treatpt + 10, "none") == 0 ||
strcmp(treatpt + 10, "no_emulation") == 0) {
xorriso->boot_image_emul= 0;
} else if(strcmp(treatpt + 10, "hard_disk") == 0) {
xorriso->boot_image_emul= 1;
} else if(strcmp(treatpt + 10, "floppy") == 0 ||
strcmp(treatpt + 10, "diskette") == 0) {
xorriso->boot_image_emul= 2;
} else {
sprintf(xorriso->info_text,
"-boot_image %s : Unknown media_type : %s",
formpt, treatpt + 10);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0);
}
} else if(strncmp(treatpt, "isohybrid=", 10) == 0 &&
strcmp(formpt, "isolinux")==0) {

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

@ -2305,13 +2305,6 @@ which bundles these individual settings:
.br
-boot_image any boot_info_table=on
.br
\fBbin_path=\fR depicts the boot image file, a binary program which is to be
started by the hardware boot facility (e.g. the BIOS) at boot time.
.br
\fBefi_path=\fR depicts a boot image file that is ready for EFI booting.
Its load_size is determined automatically, no boot info table gets
written, platform_id is 0xef.
.br
An El Torito boot catalog file gets inserted into the ISO image with address
\fBcat_path=\fR at -commit time.
It is subject to normal -overwrite and -reassure processing if there is already
@ -2321,6 +2314,17 @@ one of the boot images. But it is not necessary that it appears in the
directory tree at all. One may hide it in all trees by \fBcat_hidden=on\fR.
Other possible values are "iso_rr", "joliet", and the default "off".
.br
\fBbin_path=\fR depicts a boot image file, a binary program which is to be
started by the hardware boot facility (e.g. the BIOS) at boot time.
.br
\fBefi_path=\fR depicts a boot image file that is ready for EFI booting.
Its load_size is determined automatically, no boot info table gets
written, no boot media gets emulated, platform_id is 0xef.
.br
\fBemul_type=\fR can be one of "no_emulation", "hard_disk", "diskette".
It controls the boot media emulation code of a boot image.
The default "no_emulation" is suitable for ISOLINUX, GRUB, FreeBSD cdboot.
.br
\fBload_size=\fR is a value which depends on the boot image.
Default 2048 should be overridden only if a better value is known.
.br

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

@ -2054,12 +2054,6 @@ of the existing sessions, unless one can assume overwriteable media.
-boot_image isolinux cat_path=/boot/isolinux/boot.cat
-boot_image isolinux load_size=2048
-boot_image any boot_info_table=on
*bin_path=* depicts the boot image file, a binary program which is
to be started by the hardware boot facility (e.g. the BIOS) at
boot time.
*efi_path=* depicts a boot image file that is ready for EFI
booting. Its load_size is determined automatically, no boot info
table gets written, platform_id is 0xef.
An El Torito boot catalog file gets inserted into the ISO image
with address *cat_path=* at -commit time. It is subject to normal
-overwrite and -reassure processing if there is already a file
@ -2068,6 +2062,17 @@ of the existing sessions, unless one can assume overwriteable media.
not necessary that it appears in the directory tree at all. One
may hide it in all trees by *cat_hidden=on*. Other possible
values are "iso_rr", "joliet", and the default "off".
*bin_path=* depicts a boot image file, a binary program which is
to be started by the hardware boot facility (e.g. the BIOS) at
boot time.
*efi_path=* depicts a boot image file that is ready for EFI
booting. Its load_size is determined automatically, no boot info
table gets written, no boot media gets emulated, platform_id is
0xef.
*emul_type=* can be one of "no_emulation", "hard_disk", "diskette".
It controls the boot media emulation code of a boot image. The
default "no_emulation" is suitable for ISOLINUX, GRUB, FreeBSD
cdboot.
*load_size=* is a value which depends on the boot image. Default
2048 should be overridden only if a better value is known.
*boot_info_table=on* may be used to apply patching to a boot image
@ -4032,7 +4037,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* iso_rr_path, _definition: Insert. (line 7)
* List delimiter, _definiton: Processing. (line 8)
* MBR, _definiton: Extras. (line 26)
* MBR, set, -boot_image system_area=: Bootable. (line 112)
* MBR, set, -boot_image system_area=: Bootable. (line 117)
* MD5, control handling, -md5: Loading. (line 136)
* Media, erase, -blank: Writing. (line 45)
* Media, format, -format: Writing. (line 69)
@ -4062,7 +4067,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Ownership, global in ISO image, -uid: SetWrite. (line 162)
* Ownership, in ISO image, -chown: Manip. (line 42)
* Ownership, in ISO image, -chown_r: Manip. (line 47)
* Partition table, _definiton: Bootable. (line 119)
* Partition table, _definiton: Bootable. (line 124)
* Pathspec, _definition: SetInsert. (line 120)
* Pattern expansion, _definition: Processing. (line 22)
* Pattern expansion, for disk paths, -disk_pattern: Insert. (line 31)
@ -4113,7 +4118,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Session, mount command line, -mount_cmd: Inquiry. (line 31)
* Session, mount parameters, -mount_opts: Inquiry. (line 47)
* Session, select as input, -load: Loading. (line 11)
* System area, _definiton: Bootable. (line 112)
* System area, _definiton: Bootable. (line 117)
* Table-of-content, search sessions, -rom_toc_scan: Loading. (line 184)
* Table-of-content, show, -toc: Inquiry. (line 18)
* Timestamps, set in ISO image, -alter_date: Manip. (line 146)
@ -4174,37 +4179,37 @@ 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
Node: Charset105955
Node: Exception108709
Node: DialogCtl113224
Node: Inquiry115569
Node: Navigate119699
Node: Verify127297
Node: Restore135717
Node: Emulation142373
Node: Scripting150096
Node: Frontend155658
Node: Examples156859
Node: ExDevices158028
Node: ExCreate158662
Node: ExDialog159936
Node: ExGrowing161198
Node: ExModifying162000
Node: ExBootable162501
Node: ExCharset163048
Node: ExPseudo163876
Node: ExCdrecord164770
Node: ExMkisofs165085
Node: ExGrowisofs166088
Node: ExException167212
Node: ExTime167666
Node: ExIncBackup168125
Node: ExRestore171597
Node: ExRecovery172566
Node: Files173132
Node: Seealso174360
Node: Legal174884
Node: CommandIdx175806
Node: ConceptIdx189612

End Tag Table

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

@ -2770,13 +2770,6 @@ which bundles these individual settings:
@*
-boot_image any boot_info_table=on
@*
@strong{bin_path=} depicts the boot image file, a binary program which is to be
started by the hardware boot facility (e.g. the BIOS) at boot time.
@*
@strong{efi_path=} depicts a boot image file that is ready for EFI booting.
Its load_size is determined automatically, no boot info table gets
written, platform_id is 0xef.
@*
An El Torito boot catalog file gets inserted into the ISO image with address
@strong{cat_path=} at -commit time.
It is subject to normal -overwrite and -reassure processing if there is already
@ -2786,6 +2779,17 @@ one of the boot images. But it is not necessary that it appears in the
directory tree at all. One may hide it in all trees by @strong{cat_hidden=on}.
Other possible values are "iso_rr", "joliet", and the default "off".
@*
@strong{bin_path=} depicts a boot image file, a binary program which is to be
started by the hardware boot facility (e.g. the BIOS) at boot time.
@*
@strong{efi_path=} depicts a boot image file that is ready for EFI booting.
Its load_size is determined automatically, no boot info table gets
written, no boot media gets emulated, platform_id is 0xef.
@*
@strong{emul_type=} can be one of "no_emulation", "hard_disk", "diskette".
It controls the boot media emulation code of a boot image.
The default "no_emulation" is suitable for ISOLINUX, GRUB, FreeBSD cdboot.
@*
@strong{load_size=} is a value which depends on the boot image.
Default 2048 should be overridden only if a better value is known.
@*

4
libisoburn/trunk/xorriso/xorriso_private.h
View File

@ -279,8 +279,8 @@ struct XorrisO { /* the global context of xorriso */
int boot_platform_id;
int patch_isolinux_image; /* bit0= boot-info-table , bit1= not with EFI */
int boot_image_emul; /* 0=no emulation
(1=emulation as hard disk)
(2=emulation as floppy)
1=emulation as hard disk
2=emulation as floppy
*/
off_t boot_image_load_size;
unsigned char boot_id_string[29];

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

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