Bug fix: -as mkisofs -print-size failed with -isohybrid-mbr and a single boot image

This commit is contained in:
2013-05-13 12:40:48 +00:00
parent 8050aeb917
commit 81c5ed9282
8 changed files with 93 additions and 66 deletions

View File

@ -776,7 +776,7 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
goto ex;
/* Activate, adjust or discard boot image */
if(image!=NULL && !(flag&1)) {
if(image!=NULL) {
is_bootable= iso_image_get_boot_image(image, NULL, NULL, &bootcat_node);
if(xorriso->boot_image_bin_path[0]) {
ret= Xorriso_attach_boot_image(xorriso, xorriso->boot_count == 0);
@ -784,6 +784,8 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
goto ex;
freshly_bootable= 1;
}
}
if(image!=NULL && !(flag&1)) {
if(xorriso->boot_count > 0) {
/* Eventually rename boot catalog node to changed boot_image_cat_path */
if(is_bootable > 0) {