loader/i386/bsd: Fix type passed for the kernel

FreeBSD loader always passes "elf kernel". We currently pass "elf64 kernel"
when loading 64-bit kernel. The -CURRENT, HEAD, kernel accepts only
"elf kernel". Older kernel accepts either.

Tested with FreeBSD and DragonFlyBSD.

Reference: https://cgit.freebsd.org/src/commit/?id=b72ae900d4348118829fe04abdc11b620930c30f

Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
index 5784334029b1fd80872c89e42f32e871443daf79..4b7c436d40b10589ac7e3e6090df0c8960815f59 100644 (file)
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -1543,9 +1543,7 @@ grub_cmd_freebsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
          grub_file_t file;
          int len = is_64bit ? 8 : 4;
 
-         err = grub_freebsd_add_meta_module (argv[0], is_64bit
-                                             ? FREEBSD_MODTYPE_KERNEL64
-                                             : FREEBSD_MODTYPE_KERNEL,
+         err = grub_freebsd_add_meta_module (argv[0], FREEBSD_MODTYPE_KERNEL,
                                              argc - 1, argv + 1,
                                              kern_start,
                                              kern_end - kern_start);