From 8765230b753402e2f363531374acfae8eebeeed2 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 9 Sep 2018 15:04:05 +0200 Subject: [PATCH] Letting -report_system_area propose --mbr-force-bootable more often --- xorriso/iso_img.c | 10 ++++++++-- xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xorriso/iso_img.c b/xorriso/iso_img.c index 00d82e11..b9712968 100644 --- a/xorriso/iso_img.c +++ b/xorriso/iso_img.c @@ -1672,6 +1672,7 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso, char *volid, *crt, *mdt, *ext, *eft, uuid[17], *uuid_time; char **app_pseudo_paths= NULL; struct tm tm_erg; + int was_force_bootable= 0; struct mbr_par { uint8_t ptype; @@ -2099,8 +2100,13 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso, Xorriso_add_intvl_adr(xorriso, buf, (uint64_t) start_block, ((uint64_t) start_block) + num_blocks - 1, "d", imported_iso); - } else if((part_status & 0x80) && part_type == 0x00 && - start_block == 0 && num_blocks == 1) { + } + if((part_status & 0x80) && !was_force_bootable) { + was_force_bootable= 1; + if(buf[0]) { + Xorriso_record_cmd_linE + buf[0]= 0; + } if(mkisofs) sprintf(buf, "--mbr-force-bootable"); else diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index d1239e70..6081e6be 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2018.09.09.125911" +#define Xorriso_timestamP "2018.09.09.130316"