New -as mkisofs options -isohybrid-gpt-basdat, -isohybrid-gpt-hfsplus, -isohybrid-apm-hfsplus

xorriso/emulators.c

@@ -576,6 +576,8 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv,
     "--emul-toc", "-disallow_dir_id_ext", "--old-empty",
     "--old-root-no-md5", "--old-root-devno", "--old-root-no-ino",
     "--no_rc", "--norock", "-hfsplus", "-fat", "-chrp-boot-part",
+    "-isohybrid-gpt-basdat", "-isohybrid-gpt-hfsplus",
+    "-isohybrid-apm-hfsplus",
     ""
  };
  static char arg1_options[][41]= {
@@ -812,6 +814,9 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag)
 "  -hard-disk-boot             Boot image is a hard disk image",
 "  -no-emul-boot               Boot image is 'no emulation' image",
 "  -boot-info-table            Patch boot image with info table",
+"  -isohybrid-gpt-basdat       Mark El Torito boot image as Basic Data in GPT",
+"  -isohybrid-gpt-hfsplus      Mark El Torito boot image as HFS+ in GPT",
+"  -isohybrid-apm-hfsplus      Mark El Torito boot image as HFS+ in APM",
 "  -G FILE, -generic-boot FILE Set generic boot image name",
 "  --embedded-boot FILE        Alias of -G",
 "  --protective-msdos-label    Patch System Area by partition table",
@@ -1652,7 +1657,10 @@ not_enough_args:;
              strncmp(argpt, "isolinux_mbr=", 13)==0 ||
              strcmp(argpt, "-eltorito-alt-boot")==0 ||
              strcmp(argpt, "--protective-msdos-label")==0 ||
-             strcmp(argpt, "--boot-catalog-hide")==0) {
+             strcmp(argpt, "--boot-catalog-hide")==0 ||
+             strcmp(argpt, "-isohybrid-gpt-basdat")==0 ||
+             strcmp(argpt, "-isohybrid-gpt-hfsplus")==0 ||
+             strcmp(argpt, "-isohybrid-apm-hfsplus")==0) {
      delay_opt_list[delay_opt_count++]= i;
      if(argv[i] != argpt)
        delay_opt_list[delay_opt_count - 1]|= 1<<31;
@@ -2139,7 +2147,7 @@ problem_handler_2:;
    } else if(strcmp(argpt, "-hard-disk-boot")==0) {
      emul_boot= xorriso->boot_image_emul= 1;
    } else if(strcmp(argpt, "-boot-info-table")==0) {
-     xorriso->patch_isolinux_image= 1;
+     xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~2) | 1;
    } else if(strcmp(argpt, "-b") == 0 ||
              strcmp(argpt, "-eltorito-boot") == 0 ||
              strcmp(argpt, "--efi-boot") == 0 ||
@@ -2207,6 +2215,14 @@ problem_handler_2:;
      ret= Xorriso_option_boot_image(xorriso, "isolinux", sfe, 0);
      if(ret <= 0)
        goto problem_handler_boot;
+   } else if(strcmp(argpt, "-isohybrid-gpt-basdat") == 0) {
+     xorriso->patch_isolinux_image = (xorriso->patch_isolinux_image & ~0x1fc) |
+                                     (1 << 2);
+   } else if(strcmp(argpt, "-isohybrid-gpt-hfsplus") == 0) {
+     xorriso->patch_isolinux_image = (xorriso->patch_isolinux_image & ~0x0fc) |
+                                     (2 << 2);
+   } else if(strcmp(argpt, "-isohybrid-apm-hfsplus") == 0) {
+     xorriso->patch_isolinux_image = xorriso->patch_isolinux_image | (1 << 8);
    } else if(strcmp(argpt, "-eltorito-alt-boot")==0) {
      ret= Xorriso_genisofs_add_boot(xorriso, whom,
                                     &option_b, &emul_boot, 0);

xorriso/iso_img.c

@@ -378,7 +378,7 @@ int Xorriso_boot_item_status(struct XorrisO *xorriso, char *cat_path,
                      "/boot/isolinux/boot.cat") == 0)
      strcpy(bspec, "dir=/boot/isolinux");
    memset(zeros, 0, 28);
-   if(bspec[0] && platform_id == 0 && patch_isolinux &&
+   if(bspec[0] && platform_id == 0 && (patch_isolinux & 3) &&
       load_size == 2048 && is_default_id && emul == 0) {
      sprintf(line, "-boot_image isolinux %s\n", bspec);
      Xorriso_status_result(xorriso,filter,fp,flag&2); 
@@ -390,7 +390,7 @@ int Xorriso_boot_item_status(struct XorrisO *xorriso, char *cat_path,
    if(ret == 0)
      file_size= ((stbuf.st_size / (off_t) 512) +
                 !!(stbuf.st_size % (off_t) 512)) * 512;
-   if(platform_id == 0xef && !patch_isolinux &&
+   if(platform_id == 0xef && !(patch_isolinux & 3) &&
       load_size == file_size && is_default_id && emul == 0) {
      sprintf(line, "-boot_image any efi_path=");
      Text_shellsafe(bin_path, line, 1);

xorriso/opts_a_c.c

@@ -667,7 +667,7 @@ cannot_keep_or_patch:;
    if(isolinux_grub)
      goto treatment_patch;
    xorriso->keep_boot_image= 1;
-   xorriso->patch_isolinux_image= 0;
+   xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 0;
    xorriso->boot_image_bin_path[0]= 0;
    xorriso->patch_system_area= 0;
 
@@ -676,7 +676,7 @@ treatment_patch:;
    if(xorriso->boot_count > 0)
      goto cannot_keep_or_patch;
    xorriso->keep_boot_image= 0;
-   xorriso->patch_isolinux_image= 1;
+   xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 1;
    xorriso->boot_image_bin_path[0]= 0;
    if(strcmp(formpt, "grub") == 0) {
      xorriso->patch_isolinux_image|= 2;
@@ -688,7 +688,7 @@ treatment_patch:;
 
  } else if(strcmp(treatpt, "discard")==0) {
    xorriso->keep_boot_image= 0;
-   xorriso->patch_isolinux_image= 0;
+   xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 0;
    xorriso->boot_image_bin_path[0]= 0;
    xorriso->patch_system_area= 0;
    if((xorriso->system_area_options & 0xfc ) == 0)
@@ -766,7 +766,7 @@ treatment_patch:;
      strcat(xorriso->boot_image_cat_path, "boot.cat");
      xorriso->boot_image_load_size= 4 * 512;
      xorriso->keep_boot_image= 0;
-     xorriso->patch_isolinux_image= 1;
+     xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 1;
      strcpy(xorriso->boot_image_bin_form, formpt);
      {ret= 1; goto ex;}
 
@@ -790,7 +790,7 @@ treatment_patch:;
      goto ex;
    xorriso->keep_boot_image= 0;
    if(isolinux_grub) {
-     xorriso->patch_isolinux_image= 1;
+     xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 1;
      if(xorriso->boot_image_bin_path[0])
        xorriso->boot_image_load_size= 4 * 512;
      strcpy(xorriso->boot_image_bin_form, formpt);
@@ -852,9 +852,10 @@ treatment_patch:;
 
  } else if(strncmp(treatpt, "boot_info_table=", 16)==0) {
    if(strcmp(treatpt + 16, "off") == 0)
-     xorriso->patch_isolinux_image= 0;
+     xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 0;
    else if(strcmp(treatpt + 16, "on") == 0)
-     xorriso->patch_isolinux_image= 1 | (2 * (strcmp(treatpt, "grub") == 0));
+     xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) |
+                                    1 | (2 * (strcmp(treatpt, "grub") == 0));
    else
      was_ok= 0;
 

xorriso/write_run.c

@@ -494,7 +494,7 @@ int Xorriso_attach_boot_image(struct XorrisO *xorriso, int flag)
  if(xorriso->boot_efi_default) {
    emul= 0;
    platform_id= 0xef;
-   xorriso->patch_isolinux_image= 0;
+   xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 0;
  }
  if(platform_id == 0xef || load_size < 0) {
    ret= Xorriso_iso_lstat(xorriso, bin_path, &stbuf, 2 | 4);
@@ -2317,7 +2317,9 @@ int Xorriso_set_isolinux_options(struct XorrisO *xorriso,
                             "FATAL", 1);
    ret= -1; goto ex;
  }
- patch_table= xorriso->patch_isolinux_image & 1;
+
+ /* bit0 : 1=boot-info-table , bit2-7 : 1=EFI , 2=HFS+ , bit8 : 1=APM */
+ patch_table = xorriso->patch_isolinux_image & 0x1fd;
  if((flag & 1) && num_boots > 1) {
    ret= el_torito_set_isolinux_options(boots[num_boots - 1], patch_table, 0);
    ret= (ret == 1); goto ex;
@@ -2326,13 +2328,13 @@ int Xorriso_set_isolinux_options(struct XorrisO *xorriso,
  /* Handle patching of first attached boot image or of imported boot images 
  */
  for(i= 0; i < num_boots; i++) {
-   patch_table = xorriso->patch_isolinux_image & 1;
+   patch_table = xorriso->patch_isolinux_image & 0x1fd;
    if(patch_table && !(flag & 1)) {
      if(!el_torito_seems_boot_info_table(boots[i], 0))
-       patch_table= 0;
+       patch_table&= ~1;
      else if((xorriso->patch_isolinux_image & 2) &&
              el_torito_get_boot_platform_id(boots[i]) == 0xef)
-       patch_table= 0;
+       patch_table&= ~1;
    }
    if(i > 0 || xorriso->boot_image_isohybrid == 0) {
      ret= el_torito_set_isolinux_options(boots[i], patch_table, 0);

xorriso/xorriso_private.h

@@ -346,7 +346,11 @@ struct XorrisO { /* the global context of xorriso */
  char boot_image_bin_path[SfileadrL];
  char boot_image_bin_form[16];
  int boot_platform_id; 
- int patch_isolinux_image; /* bit0= boot-info-table , bit1= not with EFI */
+ int patch_isolinux_image; /* bit0= boot-info-table , bit1= not with EFI
+                              bit2-7= Mentioning in isohybrid GPT
+                                      1=EFI, 2=HFS+
+                              bit8= Mention in isohybrid Apple Partition Map
+                            */
  int boot_image_emul; /* 0=no emulation
                          1=emulation as hard disk
                          2=emulation as floppy

xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2012.06.18.181204"
+#define Xorriso_timestamP "2012.06.20.190651"

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.2.3, Jun 17, 2012"
+.TH XORRISOFS 1 "Version 1.2.3, Jun 20, 2012"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -941,6 +941,28 @@ The MBR gets patched according to isohybrid needs. The first partition
 describes the range of the ISO image. Its start is at block 0 by default,
 but may be set to 64 disk blocks by option \-partition_offset 16.
 .TP
+\fB\-isohybrid-gpt-basdat\fR
+Mark the current El Torito boot image (see options \-b and \-e) in GPT as
+partition of type Basic Data. This works only with \-isohybrid\-mbr and
+has the same impact on the system area as \-efi\-boot\-part. It cannot be
+combined with \-efi\-boot\-part or \-hfsplus.
+.TP
+\fB\-isohybrid-gpt-hfsplus\fR
+Mark the current El Torito boot image (see options \-b and \-e) in GPT as
+partition of type HFS+.
+Impact and restrictions are like with \-isohybrid\-gpt\-basdat.
+.TP
+.TP
+\fB\-isohybrid-apm-hfsplus\fR
+Mark the current El Torito boot image (see options \-b and \-e) in Apple
+Partition Map as partition of type HFS+. This works only with \-isohybrid\-mbr
+and has a similar impact on the system area as \-hfsplus. It cannot be
+combined with \-efi\-boot\-part or \-hfsplus.
+.br
+The ISOLINUX isohybrid MBR file must begin by a known pattern of
+32 bytes of x86 machine code which essentially does nothing. It will get
+overwritten by 32 bytes of APM header mock\-up.
+.TP
 \fB--protective-msdos-label\fR
 Patch the System Area by a simple PC\-DOS partition table where partition 1
 claims the range of the ISO image but leaves the first block unclaimed.

xorriso/xorrisofs.info

@@ -929,6 +929,27 @@ and also not combinable with MBR, GPT, or APM.
      Its start is at block 0 by default, but may be set to 64 disk
      blocks by option -partition_offset 16.
 
+-isohybrid-gpt-basdat
+     Mark the current El Torito boot image (see options -b and -e) in
+     GPT as partition of type Basic Data. This works only with
+     -isohybrid-mbr and has the same impact on the system area as
+     -efi-boot-part. It cannot be combined with -efi-boot-part or
+     -hfsplus.
+
+-isohybrid-gpt-hfsplus
+     Mark the current El Torito boot image (see options -b and -e) in
+     GPT as partition of type HFS+.  Impact and restrictions are like
+     with -isohybrid-gpt-basdat.
+
+-isohybrid-apm-hfsplus
+     Mark the current El Torito boot image (see options -b and -e) in
+     Apple Partition Map as partition of type HFS+. This works only
+     with -isohybrid-mbr and has a similar impact on the system area as
+     -hfsplus. It cannot be combined with -efi-boot-part or -hfsplus.
+     The ISOLINUX isohybrid MBR file must begin by a known pattern of
+     32 bytes of x86 machine code which essentially does nothing. It
+     will get overwritten by 32 bytes of APM header mock-up.
+
 --protective-msdos-label
      Patch the System Area by a simple PC-DOS partition table where
      partition 1 claims the range of the ISO image but leaves the first
@@ -1661,7 +1682,7 @@ File: xorrisofs.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: T
                                                               (line  84)
 * --old-root-no-md5   disable MD5 with -old-root: SetInsert.  (line 105)
 * --protective-msdos-label   Patch System Area partition table: SystemArea.
-                                                              (line  49)
+                                                              (line  70)
 * --quoted_path_list   read pathspecs from disk file: SetInsert.
                                                               (line  13)
 * --scdbackup_tag   Recording of MD5 checksum: SetExtras.     (line 101)
@@ -1673,10 +1694,10 @@ File: xorrisofs.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: T
 * -abstract   set Abstract File path:    ImageId.             (line  66)
 * -allow-lowercase   lowercase in ISO file names: SetCompl.   (line  46)
 * -append_partition   Append MBR partition after image: SystemArea.
-                                                              (line  94)
+                                                              (line 115)
 * -appid   set Application Id:           ImageId.             (line  46)
 * -b   El Torito PC-BIOS boot image:     Bootable.            (line  32)
-* -B   SUN SPARC boot images:            SystemArea.          (line 147)
+* -B   SUN SPARC boot images:            SystemArea.          (line 168)
 * -biblio   set Biblio File path:        ImageId.             (line  72)
 * -boot-info-table   Patch El Torito boot image: Bootable.    (line  80)
 * -boot-load-size   El Torito boot image load size: Bootable. (line  63)
@@ -1687,7 +1708,7 @@ 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-part   CHRP partition:      SystemArea.          (line 122)
+* -chrp-boot-part   CHRP partition:      SystemArea.          (line 143)
 * -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)
@@ -1698,7 +1719,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 111)
+* -efi-boot-part   EFI boot partition:   SystemArea.          (line 132)
 * -eltorito-alt-boot   begin next boot catalog entry: Bootable.
                                                               (line  43)
 * -eltorito-boot   El Torito PC-BIOS boot image: Bootable.    (line  40)
@@ -1737,6 +1758,11 @@ File: xorrisofs.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: T
 * -input-charset   set character set of disk file names: Charset.
                                                               (line  17)
 * -iso-level   define ISO 9660 limitations: SetCompl.         (line   7)
+* -isohybrid-apm-hfsplus   Mark boot image in APM: SystemArea.
+                                                              (line  61)
+* -isohybrid-gpt-basdat   Mark boot image in GPT: SystemArea. (line  49)
+* -isohybrid-gpt-hfsplus   Mark boot image in GPT: SystemArea.
+                                                              (line  56)
 * -isohybrid-mbr   Install ISOLINUX isohybrid MBR: SystemArea.
                                                               (line  38)
 * -J   enable production of Joliet directory tree: SetExtras. (line 110)
@@ -1758,8 +1784,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 134)
-* -mipsel-boot   MIPS Little Endian boot image: SystemArea.   (line 141)
+* -mips-boot   MIPS Big Endian boot image: SystemArea.        (line 155)
+* -mipsel-boot   MIPS Little Endian boot image: SystemArea.   (line 162)
 * -N   omit version number in ISO file names: SetCompl.       (line  73)
 * -no-emul-boot   El Torito boot image emulation: Bootable.   (line  72)
 * -no-pad   do not add zeros to ISO tree: SetProduct.         (line  76)
@@ -1777,13 +1803,13 @@ File: xorrisofs.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: T
 * -p   set Preparer Id:                  ImageId.             (line  54)
 * -p   set Publisher Id:                 ImageId.             (line  30)
 * -pad   add 300 KiB of zeros to ISO tree: SetProduct.        (line  69)
-* -partition_cyl_align   Image size alignment: SystemArea.    (line  83)
-* -partition_hd_cyl   MBR heads per cylinder: SystemArea.     (line  66)
+* -partition_cyl_align   Image size alignment: SystemArea.    (line 104)
+* -partition_hd_cyl   MBR heads per cylinder: SystemArea.     (line  87)
 * -partition_offset   Make mountable by partition 1: SystemArea.
-                                                              (line  54)
-* -partition_sec_hd   MBR sectors per head: SystemArea.       (line  70)
+                                                              (line  75)
+* -partition_sec_hd   MBR sectors per head: SystemArea.       (line  91)
 * -path-list   read pathspecs from disk file: SetInsert.      (line   8)
-* -prep-boot-part   PReP partition:      SystemArea.          (line 128)
+* -prep-boot-part   PReP partition:      SystemArea.          (line 149)
 * -preparer  set Preparer Id:            ImageId.             (line  63)
 * -prev-session   set path for loading existing ISO image: Loading.
                                                               (line  22)
@@ -1801,8 +1827,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 159)
-* -sparc-label   SUN Disk Label text:    SystemArea.          (line 162)
+* -sparc-boot   SUN SPARC boot images:   SystemArea.          (line 180)
+* -sparc-label   SUN Disk Label text:    SystemArea.          (line 183)
 * -sysid   set System Id:                ImageId.             (line  49)
 * -transparent-compression   enable recognition of zisofs files: SetInsert.
                                                               (line  61)
@@ -1847,23 +1873,29 @@ File: xorrisofs.info,  Node: ConceptIdx,  Prev: CommandIdx,  Up: Top
                                                               (line  80)
 * Bootability, control, --efi-boot:      Bootable.            (line  58)
 * Bootability, control, -b, -eltorito-boot: Bootable.         (line  32)
-* Bootability, control, -B, -sparc-boot: SystemArea.          (line 147)
+* Bootability, control, -B, -sparc-boot: SystemArea.          (line 168)
 * Bootability, control, -e:              Bootable.            (line  50)
-* Bootability, control, -mips-boot:      SystemArea.          (line 134)
-* Bootability, control, -mipsel-boot:    SystemArea.          (line 141)
+* Bootability, control, -mips-boot:      SystemArea.          (line 155)
+* Bootability, control, -mipsel-boot:    SystemArea.          (line 162)
 * Bootability, fill System Area e.g. by MBR, -G, --embedded-boot, -generic-boot: SystemArea.
                                                               (line  25)
-* Bootability, for CHRP, -chrp-boot-part: SystemArea.         (line 122)
-* Bootability, for EFI, -efi-boot-part:  SystemArea.          (line 111)
-* Bootability, for PReP, -prep-boot-part: SystemArea.         (line 128)
+* Bootability, for CHRP, -chrp-boot-part: SystemArea.         (line 143)
+* Bootability, for EFI, -efi-boot-part:  SystemArea.          (line 132)
+* Bootability, for PReP, -prep-boot-part: SystemArea.         (line 149)
 * Bootability, install ISOLINUX isohybrid MBR, -isohybrid-mbr: SystemArea.
                                                               (line  38)
+* Bootability, mark boot image in APM, -isohybrid-apm-hfsplus: SystemArea.
+                                                              (line  61)
+* Bootability, mark boot image in GPT, -isohybrid-gpt-basdat: SystemArea.
+                                                              (line  49)
+* Bootability, mark boot image in GPT, -isohybrid-gpt-hfsplus: SystemArea.
+                                                              (line  56)
 * Bootability, next entry, -eltorito-alt-boot: Bootable.      (line  43)
 * Bootability, no boot image emulation, -no-emul-boot: Bootable.
                                                               (line  72)
 * Bootability, patch System Area partition table, --protective-msdos-label: SystemArea.
-                                                              (line  49)
-* Bootability, SUN Disk Label text, -sparc-label: SystemArea. (line 162)
+                                                              (line  70)
+* Bootability, SUN Disk Label text, -sparc-label: SystemArea. (line 183)
 * Bugs, reporting:                       Bugreport.           (line   6)
 * Character Set, for disk file names, -input-charset: Charset.
                                                               (line  17)
@@ -1898,7 +1930,7 @@ File: xorrisofs.info,  Node: ConceptIdx,  Prev: CommandIdx,  Up: Top
 * Hiding, from ISO and Rock Ridge, -hide-list: SetHide.       (line  16)
 * Hiding, from Joliet, -hide-joliet:     SetHide.             (line  20)
 * Hiding, from Joliet, -hide-joliet-list: SetHide.            (line  25)
-* Image size, alignment, -partition_cyl_align: SystemArea.    (line  83)
+* Image size, alignment, -partition_cyl_align: SystemArea.    (line 104)
 * Incremental insertion, disable disk ino, --old-root-no-ino: SetInsert.
                                                               (line  84)
 * Incremental insertion, disable MD5, --old-root-no-md5: SetInsert.
@@ -1949,13 +1981,13 @@ File: xorrisofs.info,  Node: ConceptIdx,  Prev: CommandIdx,  Up: Top
 * Links, follow on disk, -f, -follow-links: SetInsert.        (line  24)
 * Links, record and load hard links, --hardlinks: SetExtras.  (line  92)
 * MBR, _definition:                      SystemArea.          (line   9)
-* MBR, append partition, -append_partition: SystemArea.       (line  94)
-* MBR, sectors per head, -partition_sec_hd: SystemArea.       (line  66)
+* MBR, append partition, -append_partition: SystemArea.       (line 115)
+* MBR, sectors per head, -partition_sec_hd: SystemArea.       (line  87)
 * MD5, record and load, --md5:           SetExtras.           (line  84)
 * Message output, redirect stderr, -log-file: Miscellaneous.  (line  28)
 * Message output, suppress, -quiet:      Miscellaneous.       (line  24)
 * Mountability, by non-trivial partition 1, -partition_offset: SystemArea.
-                                                              (line  54)
+                                                              (line  75)
 * Options, list, -help:                  Miscellaneous.       (line  20)
 * Output file, set address, -o, -output: SetProduct.          (line   8)
 * Padding, 300 KiB, -pad:                SetProduct.          (line  69)
@@ -2012,22 +2044,22 @@ Node: SetHide27373
 Node: ImageId28681
 Node: Bootable32186
 Node: SystemArea36251
-Node: Charset44286
-Node: Jigdo45312
-Node: Miscellaneous49579
-Node: Examples50952
-Node: ExSimple51438
-Node: ExGraft51917
-Node: ExMkisofs53164
-Node: ExGrowisofs54417
-Node: ExIncBackup55589
-Node: ExIncBckAcc58697
-Node: ExBootable60373
-Node: Files62465
-Node: Seealso63539
-Node: Bugreport64195
-Node: Legal64776
-Node: CommandIdx65671
-Node: ConceptIdx78675
+Node: Charset45290
+Node: Jigdo46316
+Node: Miscellaneous50583
+Node: Examples51956
+Node: ExSimple52442
+Node: ExGraft52921
+Node: ExMkisofs54168
+Node: ExGrowisofs55421
+Node: ExIncBackup56593
+Node: ExIncBckAcc59701
+Node: ExBootable61377
+Node: Files63469
+Node: Seealso64543
+Node: Bugreport65199
+Node: Legal65780
+Node: CommandIdx66675
+Node: ConceptIdx80024
 
 End Tag Table

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.2.3, Jun 17, 2012"
+@c man .TH XORRISOFS 1 "Version 1.2.3, Jun 20, 2012"
 @c man .\" Please adjust this date whenever revising the manpage.
 @c man .\"
 @c man .\" Some roff macros, for reference:
@@ -1301,6 +1301,34 @@ The MBR gets patched according to isohybrid needs. The first partition
 describes the range of the ISO image. Its start is at block 0 by default,
 but may be set to 64 disk blocks by option -partition_offset 16.
 @c man .TP
+@item -isohybrid-gpt-basdat
+@kindex -isohybrid-gpt-basdat   Mark boot image in GPT
+@cindex Bootability, mark boot image in GPT, -isohybrid-gpt-basdat
+Mark the current El Torito boot image (see options -b and -e) in GPT as
+partition of type Basic Data. This works only with -isohybrid-mbr and
+has the same impact on the system area as -efi-boot-part. It cannot be
+combined with -efi-boot-part or -hfsplus.
+@c man .TP
+@item -isohybrid-gpt-hfsplus
+@kindex -isohybrid-gpt-hfsplus   Mark boot image in GPT
+@cindex Bootability, mark boot image in GPT, -isohybrid-gpt-hfsplus
+Mark the current El Torito boot image (see options -b and -e) in GPT as
+partition of type HFS+.
+Impact and restrictions are like with -isohybrid-gpt-basdat.
+@c man .TP
+@c man .TP
+@item -isohybrid-apm-hfsplus
+@kindex -isohybrid-apm-hfsplus   Mark boot image in APM
+@cindex Bootability, mark boot image in APM, -isohybrid-apm-hfsplus
+Mark the current El Torito boot image (see options -b and -e) in Apple
+Partition Map as partition of type HFS+. This works only with -isohybrid-mbr
+and has a similar impact on the system area as -hfsplus. It cannot be
+combined with -efi-boot-part or -hfsplus.
+@*
+The ISOLINUX isohybrid MBR file must begin by a known pattern of
+32 bytes of x86 machine code which essentially does nothing. It will get
+overwritten by 32 bytes of APM header mock-up.
+@c man .TP
 @item @minus{}@minus{}protective-msdos-label
 @kindex @minus{}@minus{}protective-msdos-label   Patch System Area partition table
 @cindex Bootability, patch System Area partition table, @minus{}@minus{}protective-msdos-label