From 3813a747d1164b8b8824b2ee9ad72cbf0278777e Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Sun, 10 Sep 2017 18:50:19 +0200
Subject: [PATCH] Prevented in -report_system_area "as_mkisofs" a confusion
 about -appended_part_as_gpt and -part_like_isohybrid

---
 xorriso/iso_img.c           | 17 ++++++++++-------
 xorriso/xorriso_timestamp.h |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/xorriso/iso_img.c b/xorriso/iso_img.c
index c089c829..56748b0e 100644
--- a/xorriso/iso_img.c
+++ b/xorriso/iso_img.c
@@ -2174,14 +2174,8 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
          }
        }
        if(mbr_idx >= mbr_count) {
-         if(appended_as_gpt == 1) {
-           if(mkisofs)
-             sprintf(buf, "-appended_part_as_gpt");
-           else
-             sprintf(buf, "-boot_image any appended_part_as=gpt");
-           Xorriso_record_cmd_linE
+         if(appended_as_gpt == 1)
            appended_as_gpt= 2;
-         }
          sprintf(buf, "-append_partition %d 0x%lx ", idx + 1, part_type);
          Xorriso_add_intvl_adr(xorriso, buf, (uint64_t) num[1],
                                (uint64_t) (num[1] + num[2] - 1.0), "d",
@@ -2211,6 +2205,7 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
            Xorriso_record_cmd_linE
            buf[0]= 0;
            part_like_isohybrid= 1;
+           appended_as_gpt= 0;
          }
          /*  mark el torito for  -isohybrid-gpt-... */
          Xorriso_register_eltorito_gpt(xorriso, et_imgs + et_idx,
@@ -2394,6 +2389,14 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
      Xorriso_record_cmd_linE
  }
 
+ if(appended_as_gpt == 2) {
+   if(mkisofs)
+     sprintf(buf, "-appended_part_as_gpt");
+   else
+     sprintf(buf, "-boot_image any appended_part_as=gpt");
+   Xorriso_record_cmd_linE
+ }
+
  if(have_sparc_part) {
    if(full_sparc_part == 255) {
      if(mkisofs) {
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 3452f537..19a140f8 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2017.09.09.142818"
+#define Xorriso_timestamP "2017.09.10.164942"