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

Improved behavior with loading multiple boot images of identical content

Browse Source
This commit is contained in:
Thomas Schmitt 2010-11-23 19:37:19 +00:00
parent d24802b07e
commit 5147438506
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libisoburn/trunk/xorriso/iso_img.c
View File

@ -733,10 +733,15 @@ no_boot:;
if(ret != 1) if(ret != 1)
goto no_boot; goto no_boot;
ret= Xorriso_path_from_lba(xorriso, NULL, xorriso->loaded_boot_bin_lba, ret= iso_image_get_all_boot_imgs(image, &num_boots, &boots, &bootnodes, 0);
path, 1); Xorriso_process_msg_queues(xorriso,0);
if(ret != 1) {
num_boots= 0;
} else {
ret= Xorriso_path_from_node(xorriso, (IsoNode *) bootnodes[0], path, 0);
if(ret > 0) if(ret > 0)
bin_path_valid= 1; bin_path_valid= 1;
}
sprintf(respt, "Boot record : El Torito"); sprintf(respt, "Boot record : El Torito");
if(bin_path_valid) if(bin_path_valid)
ret= Xorriso_is_isohybrid(xorriso, bootimg_node, 0); ret= Xorriso_is_isohybrid(xorriso, bootimg_node, 0);
@ -795,9 +800,7 @@ no_boot:;
strcat(respt, "\n"); strcat(respt, "\n");
Xorriso_toc_line(xorriso, flag & 8); Xorriso_toc_line(xorriso, flag & 8);
ret= iso_image_get_all_boot_imgs(image, &num_boots, &boots, &bootnodes, 0); if(num_boots > 1) {
Xorriso_process_msg_queues(xorriso,0);
if(ret == 1 && num_boots > 1) {
for(i= 1; i < num_boots; i++) { for(i= 1; i < num_boots; i++) {
ret= Xorriso_path_from_node(xorriso, (IsoNode *) bootnodes[i], path, 0); ret= Xorriso_path_from_node(xorriso, (IsoNode *) bootnodes[i], path, 0);
if(ret > 0) if(ret > 0)

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

@ -1 +1 @@
#define Xorriso_timestamP "2010.11.21.065727" #define Xorriso_timestamP "2010.11.23.193708"