libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Gave up automatic switch to -boot_image "isolinux" "patch" after writing

Browse Source
This commit is contained in:
Thomas Schmitt 2008-10-22 20:18:04 +00:00
parent 0399eb8b65
commit a38b638243
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libisoburn/trunk/xorriso/xorriso.1
View File

@ -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. 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 Default is "isohybrid=auto" which silently omits the MBR if the signature is
missing. missing.
.br
The setting of -boot_image will change to "isolinux" "patch" after successful
writing of a session with -boot_image "isolinux" bootspec.
.TP .TP
.B Exception processing: .B Exception processing:
.PP .PP

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.10.22.110204" #define Xorriso_timestamP "2008.10.22.201702"

5
libisoburn/trunk/xorriso/xorrisoburn.c
View File

@ -1257,12 +1257,17 @@ ex:;
if(ret<=0) { if(ret<=0) {
/* >>> ??? revive discarded boot image */; /* >>> ??? revive discarded boot image */;
#ifdef NIX
/* <<< this was probably not a good idea */
} else if(xorriso->boot_image_bin_path[0]) { } else if(xorriso->boot_image_bin_path[0]) {
xorriso->keep_boot_image= 1; xorriso->keep_boot_image= 1;
xorriso->patch_isolinux_image= 1; xorriso->patch_isolinux_image= 1;
xorriso->boot_image_bin_path[0]= 0; xorriso->boot_image_bin_path[0]= 0;
sprintf(xorriso->info_text, "Switched to -boot_image isolinux patch"); sprintf(xorriso->info_text, "Switched to -boot_image isolinux patch");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
#endif /* NIX */
} }
if(disc!=NULL) if(disc!=NULL)
burn_disc_free(disc); burn_disc_free(disc);