From e6d9582ad9cbca2a4983b065ae7d08ff71143ea0 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 2 Oct 2008 09:24:58 +0000 Subject: [PATCH] Small adjustments about -boot_image --- libisoburn/trunk/xorriso/xorriso.1 | 9 ++++++--- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- libisoburn/trunk/xorriso/xorrisoburn.c | 7 ++++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1 index 6d55ead6..3fe2a231 100644 --- a/libisoburn/trunk/xorriso/xorriso.1 +++ b/libisoburn/trunk/xorriso/xorriso.1 @@ -467,8 +467,8 @@ changes. .br -outdev can be performed without previous -dev or -indev. In that case an empty ISO image with no changes pending is created. It can either be populated -by help of -add or it can be discarded silently if -dev or -indev are -performed afterwards. +by help of -map, -add et.al. or it can be discarded silently if -dev or -indev +are performed afterwards. .br Special address string "-" means standard output, to which several restrictions apply. See above paragraph "Libburn drives". @@ -1430,10 +1430,13 @@ It is possible to do this by several individual settings. E.g. .br But that should hardly be necessary. .br -The El Torito object gets inserted into the ISO image at -commit time. +A El Torito boot catalog file gets inserted into the ISO image at -commit time. Its location is the effective cat_path= . It is subject to normal -overwrite and -reassure processing if there is already a file with the same name. +.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/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 77f58a9d..05df654e 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.09.30.174925" +#define Xorriso_timestamP "2008.10.02.092354" diff --git a/libisoburn/trunk/xorriso/xorrisoburn.c b/libisoburn/trunk/xorriso/xorrisoburn.c index 836aa7a1..08b59867 100644 --- a/libisoburn/trunk/xorriso/xorrisoburn.c +++ b/libisoburn/trunk/xorriso/xorrisoburn.c @@ -1174,8 +1174,13 @@ ex:; if(ret<=0) { /* >>> ??? revive discarded boot image */; + } 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); } - if(disc!=NULL) burn_disc_free(disc); isoburn_igopt_destroy(&sopts, 0);