Made small adjustment to new -as mkisofs option -eltorito-platform

xorriso/emulators.c

@@ -2477,16 +2477,18 @@ problem_handler_2:;
      if(i + 1>=argc)
        goto not_enough_args;
      i++;
-     if(xorriso->boot_image_bin_path[0] != 0) {
+     mem= mkisofs_b_platform_id;
-       ret= Xorriso_genisofs_add_boot(xorriso, 0);
-       if(ret <= 0)
-         goto problem_handler_boot;
-     }
      mkisofs_b_platform_id= Xorriso_genisofs_platform(xorriso, argv[i], 0);
      if(mkisofs_b_platform_id < 0) {
        mkisofs_b_platform_id= 0;
        goto problem_handler_boot;
      }
+     if(mkisofs_b_platform_id != mem &&
+        xorriso->boot_image_bin_path[0] != 0) {
+       ret= Xorriso_genisofs_add_boot(xorriso, 0);
+       if(ret <= 0)
+         goto problem_handler_boot;
+     }
 
    } else if(strcmp(argpt, "-c") == 0 ||
              strcmp(argpt, "-eltorito-catalog") == 0) {

xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2017.06.03.132429"
+#define Xorriso_timestamP "2017.06.03.163742"

xorriso/xorrisofs.1

@@ -989,11 +989,14 @@ iso_rr_path, \-no\-emul\-boot, and again \-eltorito\-alt\-boot. This gesture is
 used for achieving EFI\-bootability of the GRUB2 rescue CD.
 .TP
 \fB\-eltorito-platform\fR "x86"|"PPC"|"Mac"|"efi"|0xnn|nnn
-Perform option \-eltorito\-alt\-boot and set the Platform Id number for the next
+Set the Platform Id number for the next option \-b or \-eltorito\-boot.
-option \-b or \-eltorito\-boot. The number may be chosen by a platform name or by
+The number may be chosen by a platform name or by a number between
-a number between 0 and 255 (0x00 and 0xFF). "x86" = 0 is for PC\-BIOS,
+0 and 255 (0x00 and 0xFF). "x86" = 0 is for PC\-BIOS,
 "PPC" = 1 for some PowerPC systems, "Mac" = 2 for some MacIntosh systems,
 "efi" = 0xEF for EFI on modern PCs with x86 compatible CPUs or others.
+.br
+If the new platform id differs from the previous one, \-eltorito\-alt\-boot
+gets performed.
 .TP
 \fB\-boot-load-size\fR number|"full"
 Set the number of 512\-byte blocks to be loaded at boot time

xorriso/xorrisofs.info

@@ -882,12 +882,14 @@ the System Area.
      -no-emul-boot, and again -eltorito-alt-boot.  This gesture is used
      for achieving EFI-bootability of the GRUB2 rescue CD.
 -eltorito-platform "x86"|"PPC"|"Mac"|"efi"|0xnn|nnn
-     Perform option -eltorito-alt-boot and set the Platform Id number
+     Set the Platform Id number for the next option -b or
-     for the next option -b or -eltorito-boot.  The number may be chosen
+     -eltorito-boot.  The number may be chosen by a platform name or by
-     by a platform name or by a number between 0 and 255 (0x00 and
+     a number between 0 and 255 (0x00 and 0xFF). "x86" = 0 is for
-     0xFF). "x86" = 0 is for PC-BIOS, "PPC" = 1 for some PowerPC
+     PC-BIOS, "PPC" = 1 for some PowerPC systems, "Mac" = 2 for some
-     systems, "Mac" = 2 for some MacIntosh systems, "efi" = 0xEF for EFI
+     MacIntosh systems, "efi" = 0xEF for EFI on modern PCs with x86
-     on modern PCs with x86 compatible CPUs or others.
+     compatible CPUs or others.
+     If the new platform id differs from the previous one,
+     -eltorito-alt-boot gets performed.
 -boot-load-size number|"full"
      Set the number of 512-byte blocks to be loaded at boot time from
      the boot image in the current catalog entry.
@@ -1904,13 +1906,13 @@ File: xorrisofs.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: T
 
 * --acl Recording of ACLs:               SetExtras.           (line  95)
 * --application_use set Application Use field: ImageId.       (line  79)
-* --boot-catalog-hide Hide El Torito boot catalog: Bootable.  (line 119)
+* --boot-catalog-hide Hide El Torito boot catalog: Bootable.  (line 121)
 * --efi-boot El Torito EFI boot image:   Bootable.            (line  59)
 * --embedded-boot Fill System Area e.g. by MBR: SystemArea.   (line  79)
 * --emul-toc enable table-of-content emulation: SetProduct.   (line  33)
 * --for_backup Enable backup fidelity:   SetExtras.           (line  92)
 * --gpt_disk_guid GPT GUID:              SystemArea.          (line 228)
-* --grub2-boot-info Patch El Torito boot image: Bootable.     (line 107)
+* --grub2-boot-info Patch El Torito boot image: Bootable.     (line 109)
 * --grub2-mbr Install modern GRUB2 MBR:  SystemArea.          (line  81)
 * --grub2-sparc-core SUN SPARC core file: SystemArea.         (line 283)
 * --hardlinks Recording of hardlink relations: SetExtras.     (line 116)
@@ -1956,9 +1958,9 @@ File: xorrisofs.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: T
 * -b El Torito PC-BIOS boot image:       Bootable.            (line  38)
 * -B SUN SPARC boot images:              SystemArea.          (line 268)
 * -biblio set Biblio File path:          ImageId.             (line  62)
-* -boot-info-table Patch El Torito boot image: Bootable.      (line 102)
+* -boot-info-table Patch El Torito boot image: Bootable.      (line 104)
-* -boot-load-size El Torito boot image load size: Bootable.   (line  70)
+* -boot-load-size El Torito boot image load size: Bootable.   (line  72)
-* -c El Torito boot catalog name:        Bootable.            (line 112)
+* -c El Torito boot catalog name:        Bootable.            (line 114)
 * -C set load address and write address offset: Loading.      (line  25)
 * -cdrecord-params set load address and write address offset: Loading.
                                                               (line  46)
@@ -1980,11 +1982,11 @@ File: xorrisofs.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: T
 * -efi-boot-part EFI boot partition:     SystemArea.          (line 218)
 * -eltorito-alt-boot begin next boot catalog entry: Bootable. (line  47)
 * -eltorito-boot El Torito PC-BIOS boot image: Bootable.      (line  45)
-* -eltorito-catalog El Torito boot catalog name: Bootable.    (line 117)
+* -eltorito-catalog El Torito boot catalog name: Bootable.    (line 119)
-* -eltorito-id El Torito boot section id string: Bootable.    (line  91)
+* -eltorito-id El Torito boot section id string: Bootable.    (line  93)
 * -eltorito-platform El Torito Platform Id: Bootable.         (line  63)
 * -eltorito-selcrit El Torito boot selection criteria: Bootable.
-                                                              (line  98)
+                                                              (line 100)
 * -exclude exclude disk files from inserting: SetInsert.      (line  37)
 * -exclude-list exclude disk files from inserting: SetInsert. (line  44)
 * -f follow symbolic links on disk:      SetInsert.           (line  22)
@@ -1998,7 +2000,7 @@ File: xorrisofs.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: T
 * -graft-points enable target=source pathspecs: SetInsert.    (line  28)
 * -gui increase frequency of pacifier messages: Miscellaneous.
                                                               (line  29)
-* -hard-disk-boot El Torito boot image emulation: Bootable.   (line  81)
+* -hard-disk-boot El Torito boot image emulation: Bootable.   (line  83)
 * -help list supported options:          Miscellaneous.       (line  21)
 * -hfs-bless HFS+ blessing ppc_bootdir:  SetExtras.           (line 201)
 * -hfs-bless-by HFS+ blessing:           SetExtras.           (line 191)
@@ -2061,7 +2063,7 @@ File: xorrisofs.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: T
 * -mips-boot MIPS Big Endian boot image: SystemArea.          (line 257)
 * -mipsel-boot MIPS Little Endian boot image: SystemArea.     (line 263)
 * -N omit version number in ISO file names: SetCompl.         (line  64)
-* -no-emul-boot El Torito boot image emulation: Bootable.     (line  84)
+* -no-emul-boot El Torito boot image emulation: Bootable.     (line  86)
 * -no-pad do not add zeros to ISO tree:  SetProduct.          (line  93)
 * -o set output file address:            SetProduct.          (line   8)
 * -old-exclude exclude disk files from inserting: SetInsert.  (line  42)
@@ -2142,17 +2144,17 @@ File: xorrisofs.info,  Node: ConceptIdx,  Prev: CommandIdx,  Up: Top
 * Block address, set sorting weight, --sort-weight-patterns: SetProduct.
                                                               (line  76)
 * Bootability, boot catalog hidden, --boot-catalog-hide: Bootable.
-                                                              (line 119)
+                                                              (line 121)
 * Bootability, boot catalog name, -c, -eltorito-catalog: Bootable.
-                                                              (line 112)
+                                                              (line 114)
 * Bootability, boot image emulation, -hard-disk-boot: Bootable.
-                                                              (line  81)
+                                                              (line  83)
 * Bootability, boot image load size, -boot-load-size: Bootable.
-                                                              (line  70)
+                                                              (line  72)
 * Bootability, boot image patching, --grub2-boot-info: Bootable.
-                                                              (line 107)
+                                                              (line 109)
 * Bootability, boot image patching, -boot-info-table: Bootable.
-                                                              (line 102)
+                                                              (line 104)
 * Bootability, bootable MBR partition, --mbr-force-bootable: SystemArea.
                                                               (line 139)
 * Bootability, control, --grub2-sparc-core: SystemArea.       (line 283)
@@ -2171,9 +2173,9 @@ File: xorrisofs.info,  Node: ConceptIdx,  Prev: CommandIdx,  Up: Top
 * Bootability, control, -mips-boot:      SystemArea.          (line 257)
 * Bootability, control, -mipsel-boot:    SystemArea.          (line 263)
 * Bootability, El Torito section id string, -eltorito-id: Bootable.
-                                                              (line  91)
+                                                              (line  93)
 * Bootability, El Torito selection criteria, -eltorito-selcrit: Bootable.
-                                                              (line  98)
+                                                              (line 100)
 * Bootability, fill System Area e.g. by MBR, -G, --embedded-boot, -generic-boot: SystemArea.
                                                               (line  68)
 * Bootability, for CHRP, -chrp-boot-part: SystemArea.         (line 241)
@@ -2191,7 +2193,7 @@ File: xorrisofs.info,  Node: ConceptIdx,  Prev: CommandIdx,  Up: Top
                                                               (line 108)
 * Bootability, next entry, -eltorito-alt-boot: Bootable.      (line  47)
 * Bootability, no boot image emulation, -no-emul-boot: Bootable.
-                                                              (line  84)
+                                                              (line  86)
 * Bootability, partitions like with isohybrid, -part_like_isohybrid: SystemArea.
                                                               (line 120)
 * Bootability, patch System Area partition table, --protective-msdos-label: SystemArea.
@@ -2361,24 +2363,24 @@ Node: SetExtras21966
 Node: SetHide32539
 Node: ImageId33843
 Node: Bootable38125
-Node: SystemArea44351
+Node: SystemArea44412
-Node: Charset61503
+Node: Charset61564
-Node: Jigdo62528
+Node: Jigdo62589
-Node: Miscellaneous66805
+Node: Miscellaneous66866
-Node: Examples68450
+Node: Examples68511
-Node: ExSimple68944
+Node: ExSimple69005
-Node: ExGraft69427
+Node: ExGraft69488
-Node: ExMkisofs70727
+Node: ExMkisofs70788
-Node: ExGrowisofs71993
+Node: ExGrowisofs72054
-Node: ExIncBackup73183
+Node: ExIncBackup73244
-Node: ExIncBckAcc76344
+Node: ExIncBckAcc76405
-Node: ExBootable78033
+Node: ExBootable78094
-Node: Files82215
+Node: Files82276
-Node: Environ83310
+Node: Environ83371
-Node: Seealso84081
+Node: Seealso84142
-Node: Bugreport84732
+Node: Bugreport84793
-Node: Legal85325
+Node: Legal85386
-Node: CommandIdx86222
+Node: CommandIdx86283
-Node: ConceptIdx101870
+Node: ConceptIdx101931
 
 End Tag Table

xorriso/xorrisofs.texi

@@ -1342,11 +1342,14 @@ used for achieving EFI-bootability of the GRUB2 rescue CD.
 @item -eltorito-platform "x86"|"PPC"|"Mac"|"efi"|0xnn|nnn
 @kindex -eltorito-platform   El Torito Platform Id
 @cindex Bootability, control, -eltorito-platform
-Perform option -eltorito-alt-boot and set the Platform Id number for the next
+Set the Platform Id number for the next option -b or -eltorito-boot.
-option -b or -eltorito-boot. The number may be chosen by a platform name or by
+The number may be chosen by a platform name or by a number between
-a number between 0 and 255 (0x00 and 0xFF). "x86" = 0 is for PC-BIOS,
+0 and 255 (0x00 and 0xFF). "x86" = 0 is for PC-BIOS,
 "PPC" = 1 for some PowerPC systems, "Mac" = 2 for some MacIntosh systems,
 "efi" = 0xEF for EFI on modern PCs with x86 compatible CPUs or others.
+@*
+If the new platform id differs from the previous one, -eltorito-alt-boot
+gets performed.
 @c man .TP
 @item -boot-load-size number|"full"
 @kindex -boot-load-size   El Torito boot image load size