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

Preserving the weights of imported boot image files.

Browse Source
This commit is contained in:
Thomas Schmitt 2014-10-03 17:07:35 +02:00
parent cbea1335d8
commit 1c2851b5ba
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libisofs/eltorito.c
View File

@ -538,7 +538,7 @@ int iso_image_set_boot_image(IsoImage *image, const char *image_path,
catalog->bootimages[i] = NULL; catalog->bootimages[i] = NULL;
catalog->node = cat_node; catalog->node = cat_node;
catalog->sort_weight = 1000; /* slightly high */ catalog->sort_weight = 1000; /* slightly high */
if (!boot_node->explicit_weight) if (!(boot_node->explicit_weight || boot_node->from_old_session))
boot_node->sort_weight = 2; boot_node->sort_weight = 2;
iso_node_ref((IsoNode*)cat_node); iso_node_ref((IsoNode*)cat_node);
image->bootcat = catalog; image->bootcat = catalog;
@ -719,7 +719,7 @@ int iso_image_add_boot_image(IsoImage *image, const char *image_path,
ret = create_image(image, image_path, type, &boot_img, &boot_node); ret = create_image(image, image_path, type, &boot_img, &boot_node);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (!boot_node->explicit_weight) if (!(boot_node->explicit_weight || boot_node->from_old_session))
boot_node->sort_weight = 2; boot_node->sort_weight = 2;
catalog->bootimages[catalog->num_bootimages] = boot_img; catalog->bootimages[catalog->num_bootimages] = boot_img;
catalog->num_bootimages++; catalog->num_bootimages++;