Hi,
> I'd like to fix two bugs which cause problems of the order of the boot
> entries. A diff which add EFI support will follow them.
next one
ok?
Fix a bug make the boot entries' order reverse, introduced at 1.8 on NetBSD.
http://cvsweb.netbsd.org/bsdweb.cgi/src/usr.sbin/makefs/cd9660/cd9660_eltorito.c.diff?r1=1.7&r2=1.8&only_with_tag=MAIN
diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c
b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
index 7de2bfc83f9..46ec432bc84 100644
--- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c
+++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
@@ -155,11 +155,12 @@ cd9660_add_boot_disk(iso9660_disk *diskStructure, const
char *boot_info)
break;
}
- if (tmp_image == NULL) {
+ if (tmp_image == NULL)
TAILQ_INSERT_HEAD(&diskStructure->boot_images, new_image,
image_list);
- } else
- TAILQ_INSERT_BEFORE(tmp_image, new_image, image_list);
+ else
+ TAILQ_INSERT_AFTER(&diskStructure->boot_images, tmp_image,
+ new_image, image_list);
new_image->serialno = diskStructure->image_serialno++;