From 6ee18d7f852f5b1395de63618a36ccd3cfab4438 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 22 Oct 2008 20:18:04 +0000 Subject: [PATCH] Gave up automatic switch to -boot_image "isolinux" "patch" after writing --- xorriso/xorriso.1 | 3 --- xorriso/xorriso_timestamp.h | 2 +- xorriso/xorrisoburn.c | 5 +++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xorriso/xorriso.1 b/xorriso/xorriso.1 index 2e89a44d..e1d304f0 100644 --- a/xorriso/xorriso.1 +++ b/xorriso/xorriso.1 @@ -1484,9 +1484,6 @@ Bootspec "isohybrid=off" disables MBR generation, "isohybrid=on" prevents the write session if not the isohybrid signature is found in the bin_path file. Default is "isohybrid=auto" which silently omits the MBR if the signature is missing. -.br -The setting of -boot_image will change to "isolinux" "patch" after successful -writing of a session with -boot_image "isolinux" bootspec. .TP .B Exception processing: .PP diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index f546871e..8441f8b9 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.10.22.110204" +#define Xorriso_timestamP "2008.10.22.201702" diff --git a/xorriso/xorrisoburn.c b/xorriso/xorrisoburn.c index 7821cf81..b8269201 100644 --- a/xorriso/xorrisoburn.c +++ b/xorriso/xorrisoburn.c @@ -1257,12 +1257,17 @@ ex:; if(ret<=0) { /* >>> ??? revive discarded boot image */; + +#ifdef NIX + /* <<< this was probably not a good idea */ } else if(xorriso->boot_image_bin_path[0]) { xorriso->keep_boot_image= 1; xorriso->patch_isolinux_image= 1; xorriso->boot_image_bin_path[0]= 0; sprintf(xorriso->info_text, "Switched to -boot_image isolinux patch"); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0); +#endif /* NIX */ + } if(disc!=NULL) burn_disc_free(disc);