10.4/boot-i386-loader-multiboot-deprioritize.diff

Always try kFreeBSD image format at first, as a customized kFreeBSD image could be multiboot compliant as well.

diff -ru --exclude-from freebsd-src-diff-exclude-names /var/archive3/public/freebsd-releng-10.4-src/sys/boot/i386/loader/conf.c freebsd-10.4/sys/boot/i386/loader/conf.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/boot/i386/loader/conf.c	2017-09-29 08:20:01.000000000 +0800
+++ freebsd-10.4/sys/boot/i386/loader/conf.c	2019-08-17 22:11:53.110679188 +0800
@@ -111,8 +111,6 @@
 extern struct file_format	multiboot_obj;
 
 struct file_format *file_formats[] = {
-	&multiboot,
-	&multiboot_obj,
 #ifdef LOADER_PREFER_AMD64
     &amd64_elf,
     &amd64_elf_obj,
@@ -123,6 +121,8 @@
     &amd64_elf,
     &amd64_elf_obj,
 #endif
+	&multiboot,
+	&multiboot_obj,
     NULL
 };