New -boot_image bootspec "appended_part_as=", new -as mkisofs option -appended_part_as_gpt
This commit is contained in:
parent
e5f9d21ce8
commit
a8903743a8
@ -3,7 +3,7 @@
|
||||
|
||||
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
|
||||
|
||||
Copyright 2007-2014 Thomas Schmitt, <scdbackup@gmx.net>
|
||||
Copyright 2007-2015 Thomas Schmitt, <scdbackup@gmx.net>
|
||||
|
||||
Provided under GPL version 2 or later.
|
||||
|
||||
@ -277,6 +277,7 @@ int Xorriso_new(struct XorrisO ** xorriso,char *progname, int flag)
|
||||
m->appended_partitions[i]= NULL;
|
||||
m->appended_part_types[i]= 0;
|
||||
}
|
||||
m->appended_as_gpt= 0;
|
||||
m->ascii_disc_label[0]= 0;
|
||||
m->grub2_sparc_core[0]= 0;
|
||||
memset(m->hfsp_serial_number, 0, 8);
|
||||
|
@ -1,7 +1,7 @@
|
||||
|
||||
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
|
||||
|
||||
Copyright 2007-2014 Thomas Schmitt, <scdbackup@gmx.net>
|
||||
Copyright 2007-2015 Thomas Schmitt, <scdbackup@gmx.net>
|
||||
|
||||
Provided under GPL version 2 or later.
|
||||
|
||||
@ -598,6 +598,7 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv,
|
||||
"--no_rc", "--norock", "-hfsplus", "-fat", "-chrp-boot-part",
|
||||
"-isohybrid-gpt-basdat", "-isohybrid-gpt-hfsplus",
|
||||
"-isohybrid-apm-hfsplus", "--grub2-boot-info", "-joliet-utf16",
|
||||
"-appended_part_as_gpt",
|
||||
""
|
||||
};
|
||||
static char arg1_options[][41]= {
|
||||
@ -868,6 +869,7 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag)
|
||||
" -prep-boot-part DISKFILE Set data source for MBR partition type 0x41",
|
||||
" -append_partition NUMBER TYPE FILE",
|
||||
" Append FILE after image. TYPE is hex: 0x..",
|
||||
" -appended_part_as_gpt mark appended partitions in GPT instead of MBR.",
|
||||
" --modification-date=YYYYMMDDhhmmsscc",
|
||||
" Override date of creation and modification",
|
||||
" -isohybrid-mbr FILE Set SYSLINUX mbr/isohdp[fp]x*.bin for isohybrid",
|
||||
@ -1962,6 +1964,9 @@ not_enough_args:;
|
||||
if(ret <= 0)
|
||||
goto problem_handler_2;
|
||||
|
||||
} else if(strcmp(argpt, "-appended_part_as_gpt") == 0) {
|
||||
xorriso->appended_as_gpt= 1;
|
||||
|
||||
} else if(strcmp(argpt, "-B") == 0 ||
|
||||
strcmp(argpt, "-sparc-boot") == 0) {
|
||||
i++;
|
||||
|
@ -1,7 +1,7 @@
|
||||
|
||||
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
|
||||
|
||||
Copyright 2007-2014 Thomas Schmitt, <scdbackup@gmx.net>
|
||||
Copyright 2007-2015 Thomas Schmitt, <scdbackup@gmx.net>
|
||||
|
||||
Provided under GPL version 2 or later.
|
||||
|
||||
@ -604,8 +604,13 @@ int Xorriso_boot_status_non_mbr(struct XorrisO *xorriso, IsoImage *image,
|
||||
int Xorriso_append_part_status(struct XorrisO *xorriso, IsoImage *image,
|
||||
char *filter, FILE *fp, int flag)
|
||||
{
|
||||
int i;
|
||||
int i, is_default;
|
||||
|
||||
is_default= (xorriso->appended_as_gpt == 0);
|
||||
sprintf(xorriso->result_line, "-boot_image any appended_part_as=%s\n",
|
||||
xorriso->appended_as_gpt ? "gpt" : "mbr");
|
||||
if(!(is_default && (flag & 1)))
|
||||
Xorriso_status_result(xorriso, filter, fp, flag & 2);
|
||||
for(i= 0; i < Xorriso_max_appended_partitionS; i++) {
|
||||
if(xorriso->appended_partitions[i] == NULL)
|
||||
continue;
|
||||
|
@ -1,11 +1,11 @@
|
||||
|
||||
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
|
||||
|
||||
Copyright 2007-2014 Thomas Schmitt, <scdbackup@gmx.net>
|
||||
Copyright 2007-2015 Thomas Schmitt, <scdbackup@gmx.net>
|
||||
|
||||
Provided under GPL version 2 or later.
|
||||
|
||||
This file contains the implementation of options -a* to -c* as mentioned
|
||||
This file contains the implementation of commands -a* to -c* as mentioned
|
||||
in man page or info file derived from xorriso.texi.
|
||||
*/
|
||||
|
||||
@ -1020,6 +1020,14 @@ treatment_patch:;
|
||||
}
|
||||
xorriso->partition_offset= u;
|
||||
|
||||
} else if(strncmp(treatpt, "appended_part_as=", 17) == 0) {
|
||||
if(strcmp(treatpt + 17, "gpt") == 0) {
|
||||
xorriso->appended_as_gpt = 1;
|
||||
} else if(strcmp(treatpt + 17, "mbr") == 0) {
|
||||
xorriso->appended_as_gpt = 0;
|
||||
} else
|
||||
was_ok= 0;
|
||||
|
||||
} else if(strncmp(treatpt, "partition_hd_cyl=", 17)==0) {
|
||||
u= 0;
|
||||
sscanf(treatpt + 17, "%u", &u);
|
||||
|
@ -1,11 +1,11 @@
|
||||
|
||||
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
|
||||
|
||||
Copyright 2007-2014 Thomas Schmitt, <scdbackup@gmx.net>
|
||||
Copyright 2007-2015 Thomas Schmitt, <scdbackup@gmx.net>
|
||||
|
||||
Provided under GPL version 2 or later.
|
||||
|
||||
This file contains the implementation of options as mentioned in man page
|
||||
This file contains the implementation of commands as mentioned in man page
|
||||
or info file derived from xorriso.texi.
|
||||
*/
|
||||
|
||||
@ -1736,8 +1736,11 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
|
||||
" |\"discard\"|\"keep\"|\"patch\"|\"dir=\"|\"bin_path=\"",
|
||||
" |\"cat_path=\"|\"cat_hidden=on|iso_rr|joliet|off\"",
|
||||
" |\"load_size=\"|\"boot_info_table=\"",
|
||||
" |\"grub2_boot_info=\"|\"grub2_mbr=\"",
|
||||
" |\"grub2_boot_info=\"|\"grub2_mbr=\"|\"partition_offset=\"",
|
||||
" |\"partition_hd_cyl=\"|\"partition_sec_hd=\"",
|
||||
" |\"partition_cyl_align=\"",
|
||||
" |\"system_area=\"|\"partition_table=on|off\"",
|
||||
" |\"partition_entry=\"|\"appended_part_as=\"",
|
||||
" |\"chrp_boot_part=on|off=\"|\"prep_boot_part=\"",
|
||||
" |\"efi_boot_part=\"|\"efi_boot_part=--efi-boot-image\"",
|
||||
" |\"mips_path=\"|\"mipsel_path=\"|\"mips_discard\"",
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
|
||||
|
||||
Copyright 2007-2014 Thomas Schmitt, <scdbackup@gmx.net>
|
||||
Copyright 2007-2015 Thomas Schmitt, <scdbackup@gmx.net>
|
||||
|
||||
Provided under GPL version 2 or later.
|
||||
|
||||
@ -835,6 +835,7 @@ int Xorriso_make_iso_write_opts(struct XorrisO *xorriso, IsoImage *image,
|
||||
isoburn_igopt_set_partition_img(sopts, i + 1,
|
||||
xorriso->appended_part_types[i], part_image);
|
||||
}
|
||||
isoburn_igopt_set_appended_as_gpt(sopts, xorriso->appended_as_gpt);
|
||||
isoburn_igopt_set_disc_label(sopts, xorriso->ascii_disc_label);
|
||||
isoburn_igopt_set_hfsp_serial_number(sopts, xorriso->hfsp_serial_number);
|
||||
isoburn_igopt_set_hfsp_block_size(sopts, xorriso->hfsp_block_size,
|
||||
|
@ -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 "Version 1.3.9, Jan 29, 2015"
|
||||
.TH XORRISO 1 "Version 1.3.9, Feb 06, 2015"
|
||||
.\" Please adjust this date whenever revising the manpage.
|
||||
.\"
|
||||
.\" Some roff macros, for reference:
|
||||
@ -3126,6 +3126,13 @@ then those parameters get updated when the new System Area is written.
|
||||
Special "system_area=/dev/zero" causes 32k of NUL\-bytes.
|
||||
Use this to discard an MBR which was loaded with the ISO image.
|
||||
.br
|
||||
\fBappended_part_as=gpt\fR marks partitions from \-append_partition
|
||||
in GPT rather than in MBR. In this case the MBR shows a single partition
|
||||
of type 0xee which covers the whole output data.
|
||||
.br
|
||||
\fBappended_part_as=mbr\fR is the default. Appended partitions get
|
||||
marked in GPT only if GPT is produced because of other settings.
|
||||
.br
|
||||
\fBchrp_boot_part=on\fR causes a single partition in MBR which covers
|
||||
the whole ISO image and has type 0x96. This is not compatible with any
|
||||
other feature that produces MBR partition entries. It makes GPT unrecognizable.
|
||||
@ -3272,6 +3279,9 @@ or a hexadecimal number between 0x00 and 0xff. Not all those numbers will
|
||||
yield usable results. For a list of codes search the Internet for
|
||||
"Partition Types" or run fdisk command "L".
|
||||
.br
|
||||
If some other command causes the production of GPT, then the appended
|
||||
partitions will be mentioned there too.
|
||||
.br
|
||||
The disk_path must provide the necessary data bytes at commit time.
|
||||
An empty disk_path disables this feature for the given partition number.
|
||||
.br
|
||||
|
@ -2744,6 +2744,11 @@ sector for HP PA-RISC machines.
|
||||
when the new System Area is written.
|
||||
Special "system_area=/dev/zero" causes 32k of NUL-bytes. Use this
|
||||
to discard an MBR which was loaded with the ISO image.
|
||||
*appended_part_as=gpt* marks partitions from -append_partition in
|
||||
GPT rather than in MBR. In this case the MBR shows a single
|
||||
partition of type 0xee which covers the whole output data.
|
||||
*appended_part_as=mbr* is the default. Appended partitions get
|
||||
marked in GPT only if GPT is produced because of other settings.
|
||||
*chrp_boot_part=on* causes a single partition in MBR which covers
|
||||
the whole ISO image and has type 0x96. This is not compatible with
|
||||
any other feature that produces MBR partition entries. It makes
|
||||
@ -2869,6 +2874,8 @@ sector for HP PA-RISC machines.
|
||||
number between 0x00 and 0xff. Not all those numbers will yield
|
||||
usable results. For a list of codes search the Internet for
|
||||
"Partition Types" or run fdisk command "L".
|
||||
If some other command causes the production of GPT, then the
|
||||
appended partitions will be mentioned there too.
|
||||
The disk_path must provide the necessary data bytes at commit time.
|
||||
An empty disk_path disables this feature for the given partition
|
||||
number.
|
||||
@ -5049,7 +5056,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
|
||||
* -alter_date sets timestamps in ISO image: Manip. (line 154)
|
||||
* -alter_date_r sets timestamps in ISO image: Manip. (line 187)
|
||||
* -append_partition adds arbitrary file after image end: Bootable.
|
||||
(line 291)
|
||||
(line 296)
|
||||
* -application_id sets application id: SetWrite. (line 196)
|
||||
* -application_use sets application use field: SetWrite. (line 262)
|
||||
* -as emulates mkisofs or cdrecord: Emulation. (line 13)
|
||||
@ -5287,10 +5294,11 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
|
||||
* ACL, set in ISO image, -setfacl_r: Manip. (line 105)
|
||||
* ACL, show in ISO image, -getfacl: Navigate. (line 70)
|
||||
* ACL, show in ISO image, -getfacl_r: Navigate. (line 77)
|
||||
* APM block size: Bootable. (line 282)
|
||||
* APM block size: Bootable. (line 287)
|
||||
* APM, _definition: Extras. (line 41)
|
||||
* Appendable media, _definition: Media. (line 38)
|
||||
* Appended Filesystem Image, -append_partition: Bootable. (line 291)
|
||||
* Appended Filesystem Image, -append_partition: Bootable. (line 296)
|
||||
* Appended partition, in MBR or GPT: Bootable. (line 184)
|
||||
* Automatic execution order, of arguments, -x: ArgSort. (line 16)
|
||||
* Backslash Interpretation, _definition: Processing. (line 52)
|
||||
* Backup, enable fast incremental, -disk_dev_ino: Loading. (line 217)
|
||||
@ -5307,13 +5315,13 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
|
||||
* Character Set, for output, -out_charset: SetWrite. (line 276)
|
||||
* Character set, learn from image, -auto_charset: Loading. (line 122)
|
||||
* Character Set, of terminal, -local_charset: Charset. (line 58)
|
||||
* CHRP partition, _definition: Bootable. (line 184)
|
||||
* CHRP partition, _definition: Bootable. (line 189)
|
||||
* Closed media, _definition: Media. (line 43)
|
||||
* Comment, #: Scripting. (line 173)
|
||||
* Control, signal handling, -signal_handling: Exception. (line 69)
|
||||
* Create, new ISO image, _definition: Methods. (line 6)
|
||||
* Cylinder alignment, _definition: Bootable. (line 224)
|
||||
* Cylinder size, _definition: Bootable. (line 213)
|
||||
* Cylinder alignment, _definition: Bootable. (line 229)
|
||||
* Cylinder size, _definition: Bootable. (line 218)
|
||||
* Damaged track and session, close, -close_damaged: Writing. (line 170)
|
||||
* Delete, from ISO image, -rm: Manip. (line 21)
|
||||
* Delete, from ISO image, -rm_r: Manip. (line 28)
|
||||
@ -5345,7 +5353,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
|
||||
* Drive, write and eject, -commit_eject: Writing. (line 56)
|
||||
* EA, _definition: Extras. (line 65)
|
||||
* ECMA-119, _definition: Model. (line 6)
|
||||
* EFI system partition, _definition: Bootable. (line 193)
|
||||
* EFI system partition, _definition: Bootable. (line 198)
|
||||
* El Torito, _definition: Extras. (line 19)
|
||||
* Emulation, -as: Emulation. (line 13)
|
||||
* Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 153)
|
||||
@ -5372,10 +5380,10 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
|
||||
* Group, in ISO image, -chgrp_r: Manip. (line 62)
|
||||
* Growing, _definition: Methods. (line 19)
|
||||
* Hard links, control handling, -hardlinks: Loading. (line 134)
|
||||
* HFS+ allocation block size: Bootable. (line 279)
|
||||
* HFS+ serial number: Bootable. (line 276)
|
||||
* HFS+ allocation block size: Bootable. (line 284)
|
||||
* HFS+ serial number: Bootable. (line 281)
|
||||
* hidden, set in ISO image, -hide: Manip. (line 191)
|
||||
* HP-PA boot sector, production: Bootable. (line 256)
|
||||
* HP-PA boot sector, production: Bootable. (line 261)
|
||||
* Image reading, cache size, -data_cache_size: Loading. (line 296)
|
||||
* Image, _definition: Model. (line 9)
|
||||
* Image, demand volume ID, -assert_volid: Loading. (line 108)
|
||||
@ -5433,7 +5441,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
|
||||
* Media, format, -format: Writing. (line 91)
|
||||
* Media, list formats, -list_formats: Writing. (line 134)
|
||||
* Media, list write speeds, -list_speeds: Writing. (line 146)
|
||||
* MIPS boot file, activation: Bootable. (line 235)
|
||||
* MIPS boot file, activation: Bootable. (line 240)
|
||||
* mkisofs, Emulation: Emulation. (line 16)
|
||||
* Modifying, _definition: Methods. (line 27)
|
||||
* Multi-session media, _definition: Media. (line 7)
|
||||
@ -5460,7 +5468,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
|
||||
* Ownership, global in ISO image, -uid: SetWrite. (line 282)
|
||||
* Ownership, in ISO image, -chown: Manip. (line 49)
|
||||
* Ownership, in ISO image, -chown_r: Manip. (line 54)
|
||||
* Partition offset, _definition: Bootable. (line 203)
|
||||
* Partition offset, _definition: Bootable. (line 208)
|
||||
* Partition table, _definition: Bootable. (line 165)
|
||||
* Pathspec, _definition: SetInsert. (line 124)
|
||||
* Pattern expansion, _definition: Processing. (line 24)
|
||||
@ -5468,7 +5476,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
|
||||
* Pattern expansion, for ISO paths, -iso_rr_pattern: Manip. (line 10)
|
||||
* Permissions, in ISO image, -chmod: Manip. (line 65)
|
||||
* Permissions, in ISO image, -chmod_r: Manip. (line 77)
|
||||
* PReP partition, _definition: Bootable. (line 188)
|
||||
* PReP partition, _definition: Bootable. (line 193)
|
||||
* Problems, reporting: Bugreport. (line 6)
|
||||
* Process, consolidate text output, -pkt_output: Frontend. (line 7)
|
||||
* Process, control abort on error, -abort_on: Exception. (line 27)
|
||||
@ -5527,8 +5535,8 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
|
||||
* Session, mount parameters, -mount_opts: Inquiry. (line 68)
|
||||
* Session, select as input, -load: Loading. (line 35)
|
||||
* Sorting order, for -x, -list_arg_sorting: ArgSort. (line 27)
|
||||
* SUN Disk Label, production: Bootable. (line 246)
|
||||
* SUN SPARC boot images, activation: Bootable. (line 312)
|
||||
* SUN Disk Label, production: Bootable. (line 251)
|
||||
* SUN SPARC boot images, activation: Bootable. (line 319)
|
||||
* Symbolic link, create, -lns: Insert. (line 176)
|
||||
* System area, _definition: Bootable. (line 135)
|
||||
* Table-of-content, search sessions, -rom_toc_scan: Loading. (line 238)
|
||||
@ -5596,39 +5604,39 @@ Node: Filter94447
|
||||
Node: Writing99069
|
||||
Node: SetWrite109200
|
||||
Node: Bootable129906
|
||||
Node: Jigdo148704
|
||||
Node: Charset152951
|
||||
Node: Exception156266
|
||||
Node: DialogCtl162386
|
||||
Node: Inquiry164984
|
||||
Node: Navigate173322
|
||||
Node: Verify181620
|
||||
Node: Restore191447
|
||||
Node: Emulation200051
|
||||
Node: Scripting210439
|
||||
Node: Frontend218210
|
||||
Node: Examples227817
|
||||
Node: ExDevices228995
|
||||
Node: ExCreate229661
|
||||
Node: ExDialog230946
|
||||
Node: ExGrowing232211
|
||||
Node: ExModifying233016
|
||||
Node: ExBootable233520
|
||||
Node: ExCharset234072
|
||||
Node: ExPseudo234964
|
||||
Node: ExCdrecord235862
|
||||
Node: ExMkisofs236179
|
||||
Node: ExGrowisofs237519
|
||||
Node: ExException238654
|
||||
Node: ExTime239108
|
||||
Node: ExIncBackup239567
|
||||
Node: ExRestore243557
|
||||
Node: ExRecovery244490
|
||||
Node: Files245060
|
||||
Node: Seealso246359
|
||||
Node: Bugreport247082
|
||||
Node: Legal247663
|
||||
Node: CommandIdx248674
|
||||
Node: ConceptIdx265555
|
||||
Node: Jigdo149162
|
||||
Node: Charset153409
|
||||
Node: Exception156724
|
||||
Node: DialogCtl162844
|
||||
Node: Inquiry165442
|
||||
Node: Navigate173780
|
||||
Node: Verify182078
|
||||
Node: Restore191905
|
||||
Node: Emulation200509
|
||||
Node: Scripting210897
|
||||
Node: Frontend218668
|
||||
Node: Examples228275
|
||||
Node: ExDevices229453
|
||||
Node: ExCreate230119
|
||||
Node: ExDialog231404
|
||||
Node: ExGrowing232669
|
||||
Node: ExModifying233474
|
||||
Node: ExBootable233978
|
||||
Node: ExCharset234530
|
||||
Node: ExPseudo235422
|
||||
Node: ExCdrecord236320
|
||||
Node: ExMkisofs236637
|
||||
Node: ExGrowisofs237977
|
||||
Node: ExException239112
|
||||
Node: ExTime239566
|
||||
Node: ExIncBackup240025
|
||||
Node: ExRestore244015
|
||||
Node: ExRecovery244948
|
||||
Node: Files245518
|
||||
Node: Seealso246817
|
||||
Node: Bugreport247540
|
||||
Node: Legal248121
|
||||
Node: CommandIdx249132
|
||||
Node: ConceptIdx266013
|
||||
|
||||
End Tag Table
|
||||
|
@ -50,7 +50,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 "Version 1.3.9, Jan 29, 2015"
|
||||
@c man .TH XORRISO 1 "Version 1.3.9, Feb 06, 2015"
|
||||
@c man .\" Please adjust this date whenever revising the manpage.
|
||||
@c man .\"
|
||||
@c man .\" Some roff macros, for reference:
|
||||
@ -3651,6 +3651,14 @@ then those parameters get updated when the new System Area is written.
|
||||
Special "system_area=/dev/zero" causes 32k of NUL-bytes.
|
||||
Use this to discard an MBR which was loaded with the ISO image.
|
||||
@*
|
||||
@cindex Appended partition, in MBR or GPT
|
||||
@strong{appended_part_as=gpt} marks partitions from -append_partition
|
||||
in GPT rather than in MBR. In this case the MBR shows a single partition
|
||||
of type 0xee which covers the whole output data.
|
||||
@*
|
||||
@strong{appended_part_as=mbr} is the default. Appended partitions get
|
||||
marked in GPT only if GPT is produced because of other settings.
|
||||
@*
|
||||
@cindex CHRP partition, _definition
|
||||
@strong{chrp_boot_part=on} causes a single partition in MBR which covers
|
||||
the whole ISO image and has type 0x96. This is not compatible with any
|
||||
@ -3814,6 +3822,9 @@ or a hexadecimal number between 0x00 and 0xff. Not all those numbers will
|
||||
yield usable results. For a list of codes search the Internet for
|
||||
"Partition Types" or run fdisk command "L".
|
||||
@*
|
||||
If some other command causes the production of GPT, then the appended
|
||||
partitions will be mentioned there too.
|
||||
@*
|
||||
The disk_path must provide the necessary data bytes at commit time.
|
||||
An empty disk_path disables this feature for the given partition number.
|
||||
@*
|
||||
|
@ -2,7 +2,7 @@
|
||||
/* Command line oriented batch and dialog tool which creates, loads,
|
||||
manipulates and burns ISO 9660 filesystem images.
|
||||
|
||||
Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net>
|
||||
Copyright 2007-2015 Thomas Schmitt, <scdbackup@gmx.net>
|
||||
|
||||
Provided under GPL version 2 or later.
|
||||
|
||||
@ -462,6 +462,9 @@ struct XorrisO { /* the global context of xorriso */
|
||||
/* Path and type of image files to be appended as MBR partitions */
|
||||
char *appended_partitions[Xorriso_max_appended_partitionS];
|
||||
uint8_t appended_part_types[Xorriso_max_appended_partitionS];
|
||||
/* If 1: With appended partitions: create protective MBR and mark by GPT */
|
||||
int appended_as_gpt;
|
||||
|
||||
|
||||
/* Eventual name of the non-ISO aspect of the image. E.g. SUN ASCII label.
|
||||
*/
|
||||
|
@ -1 +1 @@
|
||||
#define Xorriso_timestamP "2015.02.06.114605"
|
||||
#define Xorriso_timestamP "2015.02.06.115405"
|
||||
|
@ -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 XORRISOFS 1 "Version 1.3.9, Oct 28, 2014"
|
||||
.TH XORRISOFS 1 "Version 1.3.9, Feb 06, 2015"
|
||||
.\" Please adjust this date whenever revising the manpage.
|
||||
.\"
|
||||
.\" Some roff macros, for reference:
|
||||
@ -1153,6 +1153,17 @@ The type_code may be "FAT12", "FAT16", "Linux",
|
||||
or a hexadecimal number between 0x00 and 0xff. Not all those numbers will
|
||||
yield usable results. For a list of codes search the Internet for
|
||||
"Partition Types" or run fdisk command "L".
|
||||
.br
|
||||
If some other command causes the production of GPT, then the appended
|
||||
partitions will be mentioned there too.
|
||||
.TP
|
||||
\fB\-appended_part_as_gpt\fR
|
||||
Marks partitions from \-append_partition in GPT rather than in MBR.
|
||||
In this case the MBR shows a single partition
|
||||
of type 0xee which covers the whole output data.
|
||||
.br
|
||||
By default, appended partitions get marked in GPT only if GPT is produced
|
||||
because of other options.
|
||||
.TP
|
||||
\fB\-efi-boot-part\fR disk_path
|
||||
Copy a file from disk into the emerging ISO image and mark it by a GPT entry as
|
||||
|
@ -1126,6 +1126,15 @@ combinable and also not combinable with MBR, GPT, or APM.
|
||||
number between 0x00 and 0xff. Not all those numbers will yield
|
||||
usable results. For a list of codes search the Internet for
|
||||
"Partition Types" or run fdisk command "L".
|
||||
If some other command causes the production of GPT, then the
|
||||
appended partitions will be mentioned there too.
|
||||
|
||||
-appended_part_as_gpt
|
||||
Marks partitions from -append_partition in GPT rather than in MBR.
|
||||
In this case the MBR shows a single partition of type 0xee which
|
||||
covers the whole output data.
|
||||
By default, appended partitions get marked in GPT only if GPT is
|
||||
produced because of other options.
|
||||
|
||||
-efi-boot-part disk_path
|
||||
Copy a file from disk into the emerging ISO image and mark it by a
|
||||
@ -1830,7 +1839,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
|
||||
* --for_backup Enable backup fidelity: SetExtras. (line 67)
|
||||
* --grub2-boot-info Patch El Torito boot image: Bootable. (line 101)
|
||||
* --grub2-mbr Install modern GRUB2 MBR: SystemArea. (line 41)
|
||||
* --grub2-sparc-core SUN SPARC core file: SystemArea. (line 210)
|
||||
* --grub2-sparc-core SUN SPARC core file: SystemArea. (line 219)
|
||||
* --hardlinks Recording of hardlink relations: SetExtras. (line 92)
|
||||
* --md5 Recording of MD5 checksums: SetExtras. (line 84)
|
||||
* --modification-date set ISO image timestamps: ImageId. (line 82)
|
||||
@ -1863,9 +1872,11 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
|
||||
* -allow-lowercase lowercase in ISO file names: SetCompl. (line 46)
|
||||
* -append_partition Append MBR partition after image: SystemArea.
|
||||
(line 132)
|
||||
* -appended_part_as_gpt Appended partitions in GPT: SystemArea.
|
||||
(line 151)
|
||||
* -appid set Application Id: ImageId. (line 46)
|
||||
* -b El Torito PC-BIOS boot image: Bootable. (line 32)
|
||||
* -B SUN SPARC boot images: SystemArea. (line 192)
|
||||
* -B SUN SPARC boot images: SystemArea. (line 201)
|
||||
* -biblio set Biblio File path: ImageId. (line 72)
|
||||
* -boot-info-table Patch El Torito boot image: Bootable. (line 95)
|
||||
* -boot-load-size El Torito boot image load size: Bootable. (line 63)
|
||||
@ -1876,8 +1887,8 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
|
||||
* -checksum_algorithm_iso choose .jigdo checksums: Jigdo. (line 80)
|
||||
* -checksum_algorithm_template choose .template checksums: Jigdo.
|
||||
(line 87)
|
||||
* -chrp-boot CHRP partition: SystemArea. (line 170)
|
||||
* -chrp-boot-part CHRP partition: SystemArea. (line 160)
|
||||
* -chrp-boot CHRP partition: SystemArea. (line 179)
|
||||
* -chrp-boot-part CHRP partition: SystemArea. (line 169)
|
||||
* -copyright set Copyright File path: ImageId. (line 77)
|
||||
* -D allow deep directory hierachies: SetExtras. (line 31)
|
||||
* -d omit trailing dot in ISO file names: SetCompl. (line 56)
|
||||
@ -1888,7 +1899,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
|
||||
* -disallow_dir_id_ext enforce ISO level 1 directory names: SetCompl.
|
||||
(line 24)
|
||||
* -e El Torito EFI boot image: Bootable. (line 50)
|
||||
* -efi-boot-part EFI boot partition: SystemArea. (line 149)
|
||||
* -efi-boot-part EFI boot partition: SystemArea. (line 158)
|
||||
* -eltorito-alt-boot begin next boot catalog entry: Bootable.
|
||||
(line 43)
|
||||
* -eltorito-boot El Torito PC-BIOS boot image: Bootable. (line 40)
|
||||
@ -1933,12 +1944,12 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
|
||||
(line 16)
|
||||
* -hide-rr-moved set deep directory relocation target: SetExtras.
|
||||
(line 64)
|
||||
* -hppa-bootloader HP-PA bootloader file: SystemArea. (line 224)
|
||||
* -hppa-cmdline HP-PA PALO command line: SystemArea. (line 217)
|
||||
* -hppa-hdrversion HP-PA PALO header version: SystemArea. (line 236)
|
||||
* -hppa-kernel_32 HP-PA kernel_32 file: SystemArea. (line 227)
|
||||
* -hppa-kernel_64 HP-PA kernel_64 file: SystemArea. (line 230)
|
||||
* -hppa-ramdisk HP-PA ramdisk file: SystemArea. (line 233)
|
||||
* -hppa-bootloader HP-PA bootloader file: SystemArea. (line 233)
|
||||
* -hppa-cmdline HP-PA PALO command line: SystemArea. (line 226)
|
||||
* -hppa-hdrversion HP-PA PALO header version: SystemArea. (line 245)
|
||||
* -hppa-kernel_32 HP-PA kernel_32 file: SystemArea. (line 236)
|
||||
* -hppa-kernel_64 HP-PA kernel_64 file: SystemArea. (line 239)
|
||||
* -hppa-ramdisk HP-PA ramdisk file: SystemArea. (line 242)
|
||||
* -input-charset set character set of disk file names: Charset.
|
||||
(line 17)
|
||||
* -iso-level define ISO 9660 limitations: SetCompl. (line 7)
|
||||
@ -1969,8 +1980,8 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
|
||||
* -max-iso9660-filenames allow 37 characters in ISO file names: SetCompl.
|
||||
(line 69)
|
||||
* -md5-list set path of readable .md5: Jigdo. (line 73)
|
||||
* -mips-boot MIPS Big Endian boot image: SystemArea. (line 179)
|
||||
* -mipsel-boot MIPS Little Endian boot image: SystemArea. (line 186)
|
||||
* -mips-boot MIPS Big Endian boot image: SystemArea. (line 188)
|
||||
* -mipsel-boot MIPS Little Endian boot image: SystemArea. (line 195)
|
||||
* -N omit version number in ISO file names: SetCompl. (line 73)
|
||||
* -no-emul-boot El Torito boot image emulation: Bootable. (line 74)
|
||||
* -no-pad do not add zeros to ISO tree: SetProduct. (line 104)
|
||||
@ -1994,7 +2005,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
|
||||
(line 91)
|
||||
* -partition_sec_hd MBR sectors per head: SystemArea. (line 107)
|
||||
* -path-list read pathspecs from disk file: SetInsert. (line 8)
|
||||
* -prep-boot-part PReP partition: SystemArea. (line 173)
|
||||
* -prep-boot-part PReP partition: SystemArea. (line 182)
|
||||
* -preparer set Preparer Id: ImageId. (line 63)
|
||||
* -prev-session set path for loading existing ISO image: Loading.
|
||||
(line 22)
|
||||
@ -2012,8 +2023,8 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
|
||||
* -root redirect ISO root directory: SetInsert. (line 64)
|
||||
* -rr_reloc_dir set deep directory relocation target: SetExtras.
|
||||
(line 47)
|
||||
* -sparc-boot SUN SPARC boot images: SystemArea. (line 204)
|
||||
* -sparc-label SUN Disk Label text: SystemArea. (line 207)
|
||||
* -sparc-boot SUN SPARC boot images: SystemArea. (line 213)
|
||||
* -sparc-label SUN Disk Label text: SystemArea. (line 216)
|
||||
* -sysid set System Id: ImageId. (line 49)
|
||||
* -transparent-compression enable recognition of zisofs files: SetInsert.
|
||||
(line 61)
|
||||
@ -2063,28 +2074,28 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
|
||||
(line 101)
|
||||
* Bootability, boot image patching, -boot-info-table: Bootable.
|
||||
(line 95)
|
||||
* Bootability, control, --grub2-sparc-core: SystemArea. (line 210)
|
||||
* Bootability, control, --grub2-sparc-core: SystemArea. (line 219)
|
||||
* Bootability, control, --efi-boot: Bootable. (line 58)
|
||||
* Bootability, control, -b, -eltorito-boot: Bootable. (line 32)
|
||||
* Bootability, control, -B, -sparc-boot: SystemArea. (line 192)
|
||||
* Bootability, control, -B, -sparc-boot: SystemArea. (line 201)
|
||||
* Bootability, control, -e: Bootable. (line 50)
|
||||
* Bootability, control, -hppa-bootloader: SystemArea. (line 224)
|
||||
* Bootability, control, -hppa-cmdline: SystemArea. (line 217)
|
||||
* Bootability, control, -hppa-hdrversion: SystemArea. (line 236)
|
||||
* Bootability, control, -hppa-kernel_32: SystemArea. (line 227)
|
||||
* Bootability, control, -hppa-kernel_64: SystemArea. (line 230)
|
||||
* Bootability, control, -hppa-ramdisk: SystemArea. (line 233)
|
||||
* Bootability, control, -mips-boot: SystemArea. (line 179)
|
||||
* Bootability, control, -mipsel-boot: SystemArea. (line 186)
|
||||
* Bootability, control, -hppa-bootloader: SystemArea. (line 233)
|
||||
* Bootability, control, -hppa-cmdline: SystemArea. (line 226)
|
||||
* Bootability, control, -hppa-hdrversion: SystemArea. (line 245)
|
||||
* Bootability, control, -hppa-kernel_32: SystemArea. (line 236)
|
||||
* Bootability, control, -hppa-kernel_64: SystemArea. (line 239)
|
||||
* Bootability, control, -hppa-ramdisk: SystemArea. (line 242)
|
||||
* Bootability, control, -mips-boot: SystemArea. (line 188)
|
||||
* Bootability, control, -mipsel-boot: SystemArea. (line 195)
|
||||
* Bootability, El Torito section id string, -eltorito-id: Bootable.
|
||||
(line 82)
|
||||
* Bootability, El Torito selection criteria, -eltorito-selcrit: Bootable.
|
||||
(line 90)
|
||||
* Bootability, fill System Area e.g. by MBR, -G, --embedded-boot, -generic-boot: SystemArea.
|
||||
(line 25)
|
||||
* Bootability, for CHRP, -chrp-boot-part: SystemArea. (line 160)
|
||||
* Bootability, for EFI, -efi-boot-part: SystemArea. (line 149)
|
||||
* Bootability, for PReP, -prep-boot-part: SystemArea. (line 173)
|
||||
* Bootability, for CHRP, -chrp-boot-part: SystemArea. (line 169)
|
||||
* Bootability, for EFI, -efi-boot-part: SystemArea. (line 158)
|
||||
* Bootability, for PReP, -prep-boot-part: SystemArea. (line 182)
|
||||
* Bootability, install ISOLINUX isohybrid MBR, -isohybrid-mbr: SystemArea.
|
||||
(line 48)
|
||||
* Bootability, install modern GRUB2 MBR, --grub2-mbr: SystemArea.
|
||||
@ -2100,7 +2111,7 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
|
||||
(line 74)
|
||||
* Bootability, patch System Area partition table, --protective-msdos-label: SystemArea.
|
||||
(line 86)
|
||||
* Bootability, SUN Disk Label text, -sparc-label: SystemArea. (line 207)
|
||||
* Bootability, SUN Disk Label text, -sparc-label: SystemArea. (line 216)
|
||||
* Bugs, reporting: Bugreport. (line 6)
|
||||
* Character Set, for disk file names, -input-charset: Charset.
|
||||
(line 17)
|
||||
@ -2123,6 +2134,8 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
|
||||
* Examples: Examples. (line 6)
|
||||
* Forced output, control, --stdio_sync: SetProduct. (line 25)
|
||||
* GPT, _definition: SystemArea. (line 13)
|
||||
* GPT, mark appended partitions, -appended_part_as_gpt: SystemArea.
|
||||
(line 151)
|
||||
* HFS+, _definition: Standards. (line 32)
|
||||
* HFS+, enables production: SetExtras. (line 130)
|
||||
* HFS+, issue blessing ppc_bootdir, -hfs-bless: SetExtras. (line 188)
|
||||
@ -2256,22 +2269,22 @@ Node: SetHide30591
|
||||
Node: ImageId31899
|
||||
Node: Bootable36067
|
||||
Node: SystemArea41247
|
||||
Node: Charset52735
|
||||
Node: Jigdo53761
|
||||
Node: Miscellaneous58028
|
||||
Node: Examples59672
|
||||
Node: ExSimple60158
|
||||
Node: ExGraft60637
|
||||
Node: ExMkisofs61884
|
||||
Node: ExGrowisofs63137
|
||||
Node: ExIncBackup64309
|
||||
Node: ExIncBckAcc67427
|
||||
Node: ExBootable69103
|
||||
Node: Files71195
|
||||
Node: Seealso72269
|
||||
Node: Bugreport72925
|
||||
Node: Legal73506
|
||||
Node: CommandIdx74401
|
||||
Node: ConceptIdx89614
|
||||
Node: Charset53165
|
||||
Node: Jigdo54191
|
||||
Node: Miscellaneous58458
|
||||
Node: Examples60102
|
||||
Node: ExSimple60588
|
||||
Node: ExGraft61067
|
||||
Node: ExMkisofs62314
|
||||
Node: ExGrowisofs63567
|
||||
Node: ExIncBackup64739
|
||||
Node: ExIncBckAcc67857
|
||||
Node: ExBootable69533
|
||||
Node: Files71625
|
||||
Node: Seealso72699
|
||||
Node: Bugreport73355
|
||||
Node: Legal73936
|
||||
Node: CommandIdx74831
|
||||
Node: ConceptIdx90183
|
||||
|
||||
End Tag Table
|
||||
|
@ -50,7 +50,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 XORRISOFS 1 "Version 1.3.9, Oct 28, 2014"
|
||||
@c man .TH XORRISOFS 1 "Version 1.3.9, Feb 06, 2015"
|
||||
@c man .\" Please adjust this date whenever revising the manpage.
|
||||
@c man .\"
|
||||
@c man .\" Some roff macros, for reference:
|
||||
@ -1553,6 +1553,19 @@ The type_code may be "FAT12", "FAT16", "Linux",
|
||||
or a hexadecimal number between 0x00 and 0xff. Not all those numbers will
|
||||
yield usable results. For a list of codes search the Internet for
|
||||
"Partition Types" or run fdisk command "L".
|
||||
@*
|
||||
If some other command causes the production of GPT, then the appended
|
||||
partitions will be mentioned there too.
|
||||
@c man .TP
|
||||
@item -appended_part_as_gpt
|
||||
@kindex -appended_part_as_gpt Appended partitions in GPT
|
||||
@cindex GPT, mark appended partitions, -appended_part_as_gpt
|
||||
Marks partitions from -append_partition in GPT rather than in MBR.
|
||||
In this case the MBR shows a single partition
|
||||
of type 0xee which covers the whole output data.
|
||||
@*
|
||||
By default, appended partitions get marked in GPT only if GPT is produced
|
||||
because of other options.
|
||||
@c man .TP
|
||||
@item -efi-boot-part disk_path
|
||||
@kindex -efi-boot-part EFI boot partition
|
||||
|
Loading…
Reference in New Issue
Block a user