From 237852c4e169958fdd1fb3eee18f59be6b60f856 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 15 Aug 2016 10:24:21 +0000 Subject: [PATCH] Corrected interpretation of RFC 4122 UUID strings for GPT. Thanks Andrei Borzenkov. --- xorriso/write_run.c | 10 ++- xorriso/xorriso.1 | 8 ++- xorriso/xorriso.info | 119 ++++++++++++++++++------------------ xorriso/xorriso.texi | 8 ++- xorriso/xorriso_timestamp.h | 2 +- xorriso/xorrisofs.1 | 8 ++- xorriso/xorrisofs.info | 101 +++++++++++++++--------------- xorriso/xorrisofs.texi | 8 ++- 8 files changed, 142 insertions(+), 122 deletions(-) diff --git a/xorriso/write_run.c b/xorriso/write_run.c index 5aca32fc..be9ec970 100644 --- a/xorriso/write_run.c +++ b/xorriso/write_run.c @@ -3067,7 +3067,7 @@ ex:; int Xorriso_parse_gpt_guid(struct XorrisO *xorriso, char *text, int flag) { int bin_count= 0, ret; - uint8_t u[16]; + uint8_t u[16], tr; if(strcmp(text, "random") == 0) { xorriso->gpt_guid_mode= 0; @@ -3078,18 +3078,24 @@ int Xorriso_parse_gpt_guid(struct XorrisO *xorriso, char *text, int flag) xorriso->gpt_guid_mode= 2; return(1); } - /* Try RFC 4122 : big endian XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX */ + /* Try RFC 4122 : big endian XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX + Translate to UEFI: first three components to little-endian + */ if(strlen(text) == 36) { if(text[8] == '-' && text[13] == '-' && text[18] == '-' && text[23] == '-'){ ret= Hex_to_bin(text, 4, &bin_count, u, 0); if(ret < 0 || bin_count != 4) goto malformed; + tr= u[0]; u[0]= u[3]; u[3]= tr; + tr= u[1]; u[1]= u[2]; u[2]= tr; ret= Hex_to_bin(text + 9, 2, &bin_count, u + 4, 0); if(ret < 0 || bin_count != 2) goto malformed; + tr= u[4]; u[4]= u[5]; u[5]= tr; ret= Hex_to_bin(text + 14, 2, &bin_count, u + 6, 0); if(ret < 0 || bin_count != 2) goto malformed; + tr= u[6]; u[6]= u[7]; u[7]= tr; ret= Hex_to_bin(text + 19, 2, &bin_count, u + 8, 0); if(ret < 0 || bin_count != 2) goto malformed; diff --git a/xorriso/xorriso.1 b/xorriso/xorriso.1 index 11edd39a..faf69fae 100644 --- a/xorriso/xorriso.1 +++ b/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 "Version 1.4.5, Aug 12, 2016" +.TH XORRISO 1 "Version 1.4.5, Aug 14, 2016" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -3361,9 +3361,11 @@ Value "random" is default. Value "volume_date_uuid" produces a low quality GUID from the value set by \-volume_date "uuid". .br A string of 32 hex digits, or a RFC 4122 compliant GUID string may be used to -set the disk GUID directly. +set the disk GUID directly. UEFI prescribes the first three components of +a RFC 4122 GUID string to be byte\-swapped in the binary representation: .br E.g. gpt_disk_guid=2303cd2a\-73c7\-424a\-a298\-25632da7f446 +equals gpt_disk_guid=2acd0323c7734a42a29825632da7f446 .br The partition GUIDs get generated by minimally varying the disk GUID. .br @@ -4159,7 +4161,7 @@ file with the path given after the colon. Compute the GPT compliant CRC number and print it to the result channel. The number is shown like "0x690fd979". The special disk_path "\-" causes reading from standard input. .br -With mode \fBmake_guid\fR print a pseudo\-random GUID in RFC 4122 format +With mode \fBmake_guid\fR print a pseudo\-random GUID in RFC 4122 text format to result channel. .TP .B Navigation in ISO image and disk filesystem: diff --git a/xorriso/xorriso.info b/xorriso/xorriso.info index 193b3e3b..60f95175 100644 --- a/xorriso/xorriso.info +++ b/xorriso/xorriso.info @@ -2831,8 +2831,11 @@ Examples: "volume_date_uuid" produces a low quality GUID from the value set by -volume_date "uuid". A string of 32 hex digits, or a RFC 4122 compliant GUID string may - be used to set the disk GUID directly. - E.g. gpt_disk_guid=2303cd2a-73c7-424a-a298-25632da7f446 + be used to set the disk GUID directly. UEFI prescribes the first + three components of a RFC 4122 GUID string to be byte-swapped in + the binary representation: + E.g. gpt_disk_guid=2303cd2a-73c7-424a-a298-25632da7f446 equals + gpt_disk_guid=2acd0323c7734a42a29825632da7f446 The partition GUIDs get generated by minimally varying the disk GUID. *-boot_image any part_like_isohybrid=on* enables -boot_image @@ -3488,8 +3491,8 @@ File: xorriso.info, Node: Inquiry, Next: Navigate, Prev: DialogCtl, Up: Comm compliant CRC number and print it to the result channel. The number is shown like "0x690fd979". The special disk_path "-" causes reading from standard input. - With mode *make_guid* print a pseudo-random GUID in RFC 4122 format - to result channel. + With mode *make_guid* print a pseudo-random GUID in RFC 4122 text + format to result channel.  File: xorriso.info, Node: Navigate, Next: Verify, Prev: Inquiry, Up: Commands @@ -5130,7 +5133,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -alter_date sets timestamps in ISO image: Manip. (line 136) * -alter_date_r sets timestamps in ISO image: Manip. (line 171) * -append_partition adds arbitrary file after image end: Bootable. - (line 388) + (line 391) * -application_id sets application id: SetWrite. (line 191) * -application_use sets application use field: SetWrite. (line 256) * -as emulates mkisofs or cdrecord: Emulation. (line 13) @@ -5372,12 +5375,12 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * ACL, show in ISO image, -getfacl: Navigate. (line 60) * ACL, show in ISO image, -getfacl_r: Navigate. (line 66) * ACL, _definition: Extras. (line 50) -* APM block size: Bootable. (line 379) +* APM block size: Bootable. (line 382) * APM, _definition: Extras. (line 42) * Appendable media, _definition: Media. (line 38) -* Appended Filesystem Image, -append_partition: Bootable. (line 388) -* Appended partition, in APM: Bootable. (line 259) -* Appended partition, in MBR or GPT: Bootable. (line 252) +* Appended Filesystem Image, -append_partition: Bootable. (line 391) +* Appended partition, in APM: Bootable. (line 262) +* Appended partition, in MBR or GPT: Bootable. (line 255) * Automatic execution order, of arguments, -x: ArgSort. (line 16) * Backslash Interpretation, _definition: Processing. (line 53) * Backup, enable fast incremental, -disk_dev_ino: Loading. (line 226) @@ -5395,15 +5398,15 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Character set, learn from image, -auto_charset: Loading. (line 123) * Character Set, of terminal, -local_charset: Charset. (line 57) * Character Set, _definition: Charset. (line 6) -* CHRP partition, _definition: Bootable. (line 264) +* CHRP partition, _definition: Bootable. (line 267) * Closed media, _definition: Media. (line 44) * Comment, #: Scripting. (line 156) * Control, signal handling, -signal_handling: Exception. (line 66) * Create, new ISO image, _definition: Methods. (line 7) -* Cylinder alignment, _definition: Bootable. (line 308) -* Cylinder size, _definition: Bootable. (line 293) +* Cylinder alignment, _definition: Bootable. (line 311) +* Cylinder size, _definition: Bootable. (line 296) * Damaged track and session, close, -close_damaged: Writing. (line 164) -* DEC Alpha SRM boot sector, production: Bootable. (line 365) +* DEC Alpha SRM boot sector, production: Bootable. (line 368) * Delete, from ISO image, -rm: Manip. (line 20) * Delete, from ISO image, -rm_r: Manip. (line 26) * Delete, ISO directory, -rmdir: Manip. (line 29) @@ -5434,7 +5437,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Drive, _definition: Drives. (line 6) * EA, _definition: Extras. (line 66) * ECMA-119, _definition: Model. (line 6) -* EFI system partition, _definition: Bootable. (line 273) +* EFI system partition, _definition: Bootable. (line 276) * El Torito, _definition: Extras. (line 19) * Emulation, -as: Emulation. (line 13) * Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 155) @@ -5464,10 +5467,10 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Group, in ISO image, -chgrp_r: Manip. (line 53) * Growing, _definition: Methods. (line 20) * Hard links, control handling, -hardlinks: Loading. (line 134) -* HFS+ allocation block size: Bootable. (line 376) -* HFS+ serial number: Bootable. (line 373) +* HFS+ allocation block size: Bootable. (line 379) +* HFS+ serial number: Bootable. (line 376) * hidden, set in ISO image, -hide: Manip. (line 174) -* HP-PA boot sector, production: Bootable. (line 348) +* HP-PA boot sector, production: Bootable. (line 351) * Image reading, cache size, -data_cache_size: Loading. (line 332) * Image, demand volume ID, -assert_volid: Loading. (line 111) * Image, discard pending changes, -rollback: Writing. (line 9) @@ -5521,7 +5524,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Linux device type, -scsi_dev_family: AqDrive. (line 43) * List delimiter, _definition: Processing. (line 9) * Local Character Set, _definition: Charset. (line 11) -* MBR bootable/active flag, enforce: Bootable. (line 319) +* MBR bootable/active flag, enforce: Bootable. (line 322) * MBR, set, -boot_image system_area=: Bootable. (line 187) * MBR, _definition: Extras. (line 27) * MD5, control handling, -md5: Loading. (line 182) @@ -5529,7 +5532,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Media, format, -format: Writing. (line 87) * Media, list formats, -list_formats: Writing. (line 129) * Media, list write speeds, -list_speeds: Writing. (line 140) -* MIPS boot file, activation: Bootable. (line 327) +* MIPS boot file, activation: Bootable. (line 330) * mkisofs, Emulation: Emulation. (line 17) * Modifying, _definition: Methods. (line 28) * Multi-session media, _definition: Media. (line 7) @@ -5556,15 +5559,15 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Ownership, global in ISO image, -uid: SetWrite. (line 274) * Ownership, in ISO image, -chown: Manip. (line 43) * Ownership, in ISO image, -chown_r: Manip. (line 47) -* Partition offset, _definition: Bootable. (line 283) -* Partition table, _definition: Bootable. (line 233) +* Partition offset, _definition: Bootable. (line 286) +* Partition table, _definition: Bootable. (line 236) * Pathspec, _definition: SetInsert. (line 117) * Pattern expansion, for disk paths, -disk_pattern: Insert. (line 34) * Pattern expansion, for ISO paths, -iso_rr_pattern: Manip. (line 10) * Pattern expansion, _definition: Processing. (line 25) * Permissions, in ISO image, -chmod: Manip. (line 55) * Permissions, in ISO image, -chmod_r: Manip. (line 66) -* PReP partition, _definition: Bootable. (line 268) +* PReP partition, _definition: Bootable. (line 271) * Problems, reporting: Bugreport. (line 6) * Process, consolidate text output, -pkt_output: Frontend. (line 7) * Process, control abort on error, -abort_on: Exception. (line 27) @@ -5624,8 +5627,8 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Session, select as input, -load: Loading. (line 33) * Session, _definition: Model. (line 6) * Sorting order, for -x, -list_arg_sorting: ArgSort. (line 26) -* SUN Disk Label, production: Bootable. (line 338) -* SUN SPARC boot images, activation: Bootable. (line 411) +* SUN Disk Label, production: Bootable. (line 341) +* SUN SPARC boot images, activation: Bootable. (line 414) * Symbolic link, create, -lns: Insert. (line 166) * System area, _definition: Bootable. (line 187) * Table-of-content, search sessions, -rom_toc_scan: Loading. (line 278) @@ -5694,39 +5697,39 @@ Node: Filter100874 Node: Writing105496 Node: SetWrite115652 Node: Bootable139799 -Node: Jigdo164347 -Node: Charset168606 -Node: Exception171935 -Node: DialogCtl178064 -Node: Inquiry180666 -Node: Navigate189213 -Node: Verify197508 -Node: Restore207386 -Node: Emulation215999 -Node: Scripting226458 -Node: Frontend234241 -Node: Examples243867 -Node: ExDevices245045 -Node: ExCreate245706 -Node: ExDialog247006 -Node: ExGrowing248277 -Node: ExModifying249086 -Node: ExBootable249596 -Node: ExCharset250151 -Node: ExPseudo251047 -Node: ExCdrecord251974 -Node: ExMkisofs252294 -Node: ExGrowisofs253651 -Node: ExException254805 -Node: ExTime255263 -Node: ExIncBackup255721 -Node: ExRestore259747 -Node: ExRecovery260693 -Node: Files261265 -Node: Seealso262599 -Node: Bugreport263314 -Node: Legal263905 -Node: CommandIdx264917 -Node: ConceptIdx282105 +Node: Jigdo164535 +Node: Charset168794 +Node: Exception172123 +Node: DialogCtl178252 +Node: Inquiry180854 +Node: Navigate189406 +Node: Verify197701 +Node: Restore207579 +Node: Emulation216192 +Node: Scripting226651 +Node: Frontend234434 +Node: Examples244060 +Node: ExDevices245238 +Node: ExCreate245899 +Node: ExDialog247199 +Node: ExGrowing248470 +Node: ExModifying249279 +Node: ExBootable249789 +Node: ExCharset250344 +Node: ExPseudo251240 +Node: ExCdrecord252167 +Node: ExMkisofs252487 +Node: ExGrowisofs253844 +Node: ExException254998 +Node: ExTime255456 +Node: ExIncBackup255914 +Node: ExRestore259940 +Node: ExRecovery260886 +Node: Files261458 +Node: Seealso262792 +Node: Bugreport263507 +Node: Legal264098 +Node: CommandIdx265110 +Node: ConceptIdx282298  End Tag Table diff --git a/xorriso/xorriso.texi b/xorriso/xorriso.texi index 8afc87e0..0179159e 100644 --- a/xorriso/xorriso.texi +++ b/xorriso/xorriso.texi @@ -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.4.5, Aug 12, 2016" +@c man .TH XORRISO 1 "Version 1.4.5, Aug 14, 2016" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -3901,9 +3901,11 @@ Value "random" is default. Value "volume_date_uuid" produces a low quality GUID from the value set by -volume_date "uuid". @* A string of 32 hex digits, or a RFC 4122 compliant GUID string may be used to -set the disk GUID directly. +set the disk GUID directly. UEFI prescribes the first three components of +a RFC 4122 GUID string to be byte-swapped in the binary representation: @* E.g. gpt_disk_guid=2303cd2a-73c7-424a-a298-25632da7f446 +equals gpt_disk_guid=2acd0323c7734a42a29825632da7f446 @* The partition GUIDs get generated by minimally varying the disk GUID. @* @@ -4797,7 +4799,7 @@ file with the path given after the colon. Compute the GPT compliant CRC number and print it to the result channel. The number is shown like "0x690fd979". The special disk_path "-" causes reading from standard input. @* -With mode @strong{make_guid} print a pseudo-random GUID in RFC 4122 format +With mode @strong{make_guid} print a pseudo-random GUID in RFC 4122 text format to result channel. @end table @c man .TP diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 1e04e42e..c79a3bb9 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2016.08.12.185822" +#define Xorriso_timestamP "2016.08.15.102443" diff --git a/xorriso/xorrisofs.1 b/xorriso/xorrisofs.1 index 6cb959a3..1703d37a 100644 --- a/xorriso/xorrisofs.1 +++ b/xorriso/xorrisofs.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 XORRISOFS 1 "Version 1.4.5, Aug 12, 2016" +.TH XORRISOFS 1 "Version 1.4.5, Aug 14, 2016" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -1307,9 +1307,11 @@ Value "random" is default. Value "modification\-date" produces a low quality GUID from the value set by option \-\-modification\-date=. .br A string of 32 hex digits, or a RFC 4122 compliant GUID string may be used to -set the disk GUID directly. +set the disk GUID directly. UEFI prescribes the first three components of +a RFC 4122 GUID string to be byte\-swapped in the binary representation: .br -E.g. \-\-gpt_disk_guid 2303cd2a\-73c7\-424a\-a298\-25632da7f446 +E.g. \-\-gpt_disk_guid 2303cd2a\-73c7\-424a\-a298\-25632da7f446 +equals \-\-gpt_disk_guid 2acd0323c7734a42a29825632da7f446 .br The partition GUIDs get generated by minimally varying the disk GUID. .TP diff --git a/xorriso/xorrisofs.info b/xorriso/xorrisofs.info index bc22035f..50c0058e 100644 --- a/xorriso/xorrisofs.info +++ b/xorriso/xorrisofs.info @@ -1143,8 +1143,11 @@ Examples: is default. Value "modification-date" produces a low quality GUID from the value set by option --modification-date=. A string of 32 hex digits, or a RFC 4122 compliant GUID string may - be used to set the disk GUID directly. - E.g. --gpt_disk_guid 2303cd2a-73c7-424a-a298-25632da7f446 + be used to set the disk GUID directly. UEFI prescribes the first + three components of a RFC 4122 GUID string to be byte-swapped in + the binary representation: + E.g. --gpt_disk_guid 2303cd2a-73c7-424a-a298-25632da7f446 equals + --gpt_disk_guid 2acd0323c7734a42a29825632da7f446 The partition GUIDs get generated by minimally varying the disk GUID. -chrp-boot-part @@ -1860,7 +1863,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * --gpt_disk_guid GPT GUID: SystemArea. (line 216) * --grub2-boot-info Patch El Torito boot image: Bootable. (line 89) * --grub2-mbr Install modern GRUB2 MBR: SystemArea. (line 77) -* --grub2-sparc-core SUN SPARC core file: SystemArea. (line 268) +* --grub2-sparc-core SUN SPARC core file: SystemArea. (line 271) * --hardlinks Recording of hardlink relations: SetExtras. (line 116) * --mbr-force-bootable Enforce MBR bootable/active flag: SystemArea. (line 127) @@ -1893,7 +1896,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -A set Application Id: ImageId. (line 34) * -abstract set Abstract File path: ImageId. (line 57) * -allow-lowercase lowercase in ISO file names: SetCompl. (line 42) -* -alpha-boot DEC Alpha SRM bootloader: SystemArea. (line 291) +* -alpha-boot DEC Alpha SRM bootloader: SystemArea. (line 294) * -appended_part_as_apm Appended partitions in APM: SystemArea. (line 200) * -appended_part_as_gpt Appended partitions in GPT: SystemArea. @@ -1902,7 +1905,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T (line 174) * -appid set Application Id: ImageId. (line 41) * -b El Torito PC-BIOS boot image: Bootable. (line 32) -* -B SUN SPARC boot images: SystemArea. (line 253) +* -B SUN SPARC boot images: SystemArea. (line 256) * -biblio set Biblio File path: ImageId. (line 62) * -boot-info-table Patch El Torito boot image: Bootable. (line 84) * -boot-load-size El Torito boot image load size: Bootable. (line 57) @@ -1913,8 +1916,8 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -checksum_algorithm_iso choose .jigdo checksums: Jigdo. (line 72) * -checksum_algorithm_template choose .template checksums: Jigdo. (line 78) -* -chrp-boot CHRP partition: SystemArea. (line 235) -* -chrp-boot-part CHRP partition: SystemArea. (line 226) +* -chrp-boot CHRP partition: SystemArea. (line 238) +* -chrp-boot-part CHRP partition: SystemArea. (line 229) * -copyright set Copyright File path: ImageId. (line 66) * -D allow deep directory hierachies: SetExtras. (line 60) * -d omit trailing dot in ISO file names: SetCompl. (line 50) @@ -1969,12 +1972,12 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T (line 15) * -hide-rr-moved set deep directory relocation target: SetExtras. (line 90) -* -hppa-bootloader HP-PA bootloader file: SystemArea. (line 280) -* -hppa-cmdline HP-PA PALO command line: SystemArea. (line 274) -* -hppa-hdrversion HP-PA PALO header version: SystemArea. (line 288) -* -hppa-kernel_32 HP-PA kernel_32 file: SystemArea. (line 282) -* -hppa-kernel_64 HP-PA kernel_64 file: SystemArea. (line 284) -* -hppa-ramdisk HP-PA ramdisk file: SystemArea. (line 286) +* -hppa-bootloader HP-PA bootloader file: SystemArea. (line 283) +* -hppa-cmdline HP-PA PALO command line: SystemArea. (line 277) +* -hppa-hdrversion HP-PA PALO header version: SystemArea. (line 291) +* -hppa-kernel_32 HP-PA kernel_32 file: SystemArea. (line 285) +* -hppa-kernel_64 HP-PA kernel_64 file: SystemArea. (line 287) +* -hppa-ramdisk HP-PA ramdisk file: SystemArea. (line 289) * -input-charset set character set of disk file names: Charset. (line 17) * -iso-level define ISO 9660 limitations: SetCompl. (line 7) @@ -2003,8 +2006,8 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -max-iso9660-filenames allow 37 characters in ISO file names: SetCompl. (line 61) * -md5-list set path of readable .md5: Jigdo. (line 67) -* -mips-boot MIPS Big Endian boot image: SystemArea. (line 242) -* -mipsel-boot MIPS Little Endian boot image: SystemArea. (line 248) +* -mips-boot MIPS Big Endian boot image: SystemArea. (line 245) +* -mipsel-boot MIPS Little Endian boot image: SystemArea. (line 251) * -N omit version number in ISO file names: SetCompl. (line 64) * -no-emul-boot El Torito boot image emulation: Bootable. (line 66) * -no-pad do not add zeros to ISO tree: SetProduct. (line 93) @@ -2028,7 +2031,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -part_like_isohybrid Mark partitions like with isohybrid: SystemArea. (line 116) * -path-list read pathspecs from disk file: SetInsert. (line 8) -* -prep-boot-part PReP partition: SystemArea. (line 237) +* -prep-boot-part PReP partition: SystemArea. (line 240) * -preparer set Preparer Id: ImageId. (line 55) * -prev-session set path for loading existing ISO image: Loading. (line 21) @@ -2045,8 +2048,8 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -root redirect ISO root directory: SetInsert. (line 55) * -rr_reloc_dir set deep directory relocation target: SetExtras. (line 74) -* -sparc-boot SUN SPARC boot images: SystemArea. (line 264) -* -sparc-label SUN Disk Label text: SystemArea. (line 266) +* -sparc-boot SUN SPARC boot images: SystemArea. (line 267) +* -sparc-label SUN Disk Label text: SystemArea. (line 269) * -sysid set System Id: ImageId. (line 43) * -transparent-compression enable recognition of zisofs files: SetInsert. (line 53) @@ -2100,29 +2103,29 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top (line 84) * Bootability, bootable MBR partition, --mbr-force-bootable: SystemArea. (line 127) -* Bootability, control, --grub2-sparc-core: SystemArea. (line 268) +* Bootability, control, --grub2-sparc-core: SystemArea. (line 271) * Bootability, control, --efi-boot: Bootable. (line 53) -* Bootability, control, -alpha-boot: SystemArea. (line 291) +* Bootability, control, -alpha-boot: SystemArea. (line 294) * Bootability, control, -b, -eltorito-boot: Bootable. (line 32) -* Bootability, control, -B, -sparc-boot: SystemArea. (line 253) +* Bootability, control, -B, -sparc-boot: SystemArea. (line 256) * Bootability, control, -e: Bootable. (line 47) -* Bootability, control, -hppa-bootloader: SystemArea. (line 280) -* Bootability, control, -hppa-cmdline: SystemArea. (line 274) -* Bootability, control, -hppa-hdrversion: SystemArea. (line 288) -* Bootability, control, -hppa-kernel_32: SystemArea. (line 282) -* Bootability, control, -hppa-kernel_64: SystemArea. (line 284) -* Bootability, control, -hppa-ramdisk: SystemArea. (line 286) -* Bootability, control, -mips-boot: SystemArea. (line 242) -* Bootability, control, -mipsel-boot: SystemArea. (line 248) +* Bootability, control, -hppa-bootloader: SystemArea. (line 283) +* Bootability, control, -hppa-cmdline: SystemArea. (line 277) +* Bootability, control, -hppa-hdrversion: SystemArea. (line 291) +* Bootability, control, -hppa-kernel_32: SystemArea. (line 285) +* Bootability, control, -hppa-kernel_64: SystemArea. (line 287) +* Bootability, control, -hppa-ramdisk: SystemArea. (line 289) +* Bootability, control, -mips-boot: SystemArea. (line 245) +* Bootability, control, -mipsel-boot: SystemArea. (line 251) * Bootability, El Torito section id string, -eltorito-id: Bootable. (line 73) * Bootability, El Torito selection criteria, -eltorito-selcrit: Bootable. (line 80) * Bootability, fill System Area e.g. by MBR, -G, --embedded-boot, -generic-boot: SystemArea. (line 64) -* Bootability, for CHRP, -chrp-boot-part: SystemArea. (line 226) +* Bootability, for CHRP, -chrp-boot-part: SystemArea. (line 229) * Bootability, for EFI, -efi-boot-part: SystemArea. (line 206) -* Bootability, for PReP, -prep-boot-part: SystemArea. (line 237) +* Bootability, for PReP, -prep-boot-part: SystemArea. (line 240) * Bootability, install ISOLINUX isohybrid MBR, -isohybrid-mbr: SystemArea. (line 83) * Bootability, install modern GRUB2 MBR, --grub2-mbr: SystemArea. @@ -2140,7 +2143,7 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top (line 116) * Bootability, patch System Area partition table, --protective-msdos-label: SystemArea. (line 123) -* Bootability, SUN Disk Label text, -sparc-label: SystemArea. (line 266) +* Bootability, SUN Disk Label text, -sparc-label: SystemArea. (line 269) * Bugs, reporting: Bugreport. (line 6) * Character Set, for disk file names, -input-charset: Charset. (line 17) @@ -2304,22 +2307,22 @@ Node: SetHide32499 Node: ImageId33803 Node: Bootable38085 Node: SystemArea43253 -Node: Charset59512 -Node: Jigdo60537 -Node: Miscellaneous64814 -Node: Examples66459 -Node: ExSimple66953 -Node: ExGraft67436 -Node: ExMkisofs68736 -Node: ExGrowisofs70002 -Node: ExIncBackup71192 -Node: ExIncBckAcc74353 -Node: ExBootable76042 -Node: Files80224 -Node: Seealso81319 -Node: Bugreport81968 -Node: Legal82559 -Node: CommandIdx83456 -Node: ConceptIdx98894 +Node: Charset59702 +Node: Jigdo60727 +Node: Miscellaneous65004 +Node: Examples66649 +Node: ExSimple67143 +Node: ExGraft67626 +Node: ExMkisofs68926 +Node: ExGrowisofs70192 +Node: ExIncBackup71382 +Node: ExIncBckAcc74543 +Node: ExBootable76232 +Node: Files80414 +Node: Seealso81509 +Node: Bugreport82158 +Node: Legal82749 +Node: CommandIdx83646 +Node: ConceptIdx99084  End Tag Table diff --git a/xorriso/xorrisofs.texi b/xorriso/xorrisofs.texi index f3d4caed..159c7dd4 100644 --- a/xorriso/xorrisofs.texi +++ b/xorriso/xorrisofs.texi @@ -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.4.5, Aug 12, 2016" +@c man .TH XORRISOFS 1 "Version 1.4.5, Aug 14, 2016" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -1725,9 +1725,11 @@ Value "random" is default. Value "modification-date" produces a low quality GUID from the value set by option @minus{}@minus{}modification-date=. @* A string of 32 hex digits, or a RFC 4122 compliant GUID string may be used to -set the disk GUID directly. +set the disk GUID directly. UEFI prescribes the first three components of +a RFC 4122 GUID string to be byte-swapped in the binary representation: @* -E.g. @minus{}@minus{}gpt_disk_guid 2303cd2a-73c7-424a-a298-25632da7f446 +E.g. @minus{}@minus{}gpt_disk_guid 2303cd2a-73c7-424a-a298-25632da7f446 +equals @minus{}@minus{}gpt_disk_guid 2acd0323c7734a42a29825632da7f446 @* The partition GUIDs get generated by minimally varying the disk GUID. @c man .TP