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

Better handling of El Torito boot images with identical block address

Browse Source 
at image load time.
This commit is contained in:
Thomas Schmitt 2010-11-24 10:06:19 +01:00
parent a488f8fb14
commit 48ae8acbd6
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libisofs/fs_image.c
View File

@ -2796,8 +2796,17 @@ int image_builder_create_node(IsoNodeBuilder *builder, IsoImage *image,
break; break;
if (idx < fsdata->num_bootimgs) { if (idx < fsdata->num_bootimgs) {
/* it is boot image node */ /* it is boot image node */
if (image->bootcat->bootimages[idx]->image != NULL) { if (image->bootcat->bootimages[idx]->image != NULL) {
/* idx is already occupied, try to find unoccupied one
which has the same block address.
*/
for (; idx < fsdata->num_bootimgs; idx++)
if (fsdata->eltorito && data->sections[0].block ==
fsdata->bootblocks[idx] &&
image->bootcat->bootimages[idx]->image == NULL)
break;
}
if (idx >= fsdata->num_bootimgs) {
ret = iso_msg_submit(image->id, ISO_EL_TORITO_WARN, 0, ret = iso_msg_submit(image->id, ISO_EL_TORITO_WARN, 0,
"More than one ISO node has been found for the same boot image."); "More than one ISO node has been found for the same boot image.");
if (ret < 0) { if (ret < 0) {