[PATCH] bsd: Fix type passed for the kernel

[PATCH] bsd: Fix type passed for the kernel

[Vladimir Serbinenko]

FreeBSD loader always passes "elf kernel". -CURRENT kernel accepts only
"elf kernel", older kernel accepts either.

Tested on FreeBSD and DragonFlyBSD

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

Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
---
 grub-core/loader/i386/bsd.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
index dd1024d4b..ac70dde8c 100644
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -1876,9 +1876,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);
-- 
2.48.1


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Re: [PATCH] bsd: Fix type passed for the kernel

[Daniel Kiper]

On Mon, Mar 03, 2025 at 12:04:31AM +0300, Vladimir Serbinenko wrote:
> FreeBSD loader always passes "elf kernel". -CURRENT kernel accepts only

What is "-CURRENT"?

> "elf kernel", older kernel accepts either.

You repeat "elf kernel" twice. I think something is off here...

> Tested on FreeBSD and DragonFlyBSD
>
> Reference: https://cgit.freebsd.org/src/commit/?id=b72ae900d4348118829fe04abdc11b620930c30f
>
> Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>

Daniel

_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Re: [PATCH] bsd: Fix type passed for the kernel

[Vladimir 'phcoder' Serbinenko]

[-- Attachment #1.1: Type: text/plain, Size: 740 bytes --]

Le mar. 4 mars 2025, 16:25, Daniel Kiper <dkiper@net-space.pl> a écrit :

> On Mon, Mar 03, 2025 at 12:04:31AM +0300, Vladimir Serbinenko wrote:
> > FreeBSD loader always passes "elf kernel". -CURRENT kernel accepts only
>
> What is "-CURRENT"?
>
Basically HEAD/master in FreeBSD world.

>
> > "elf kernel", older kernel accepts either.
>
> You repeat "elf kernel" twice. I think something is off here...
>
No, it's correct. We pass elf64 kernel but FreeBSD passes and across only
elf kernel

>
> > Tested on FreeBSD and DragonFlyBSD
> >
> > Reference:
> https://cgit.freebsd.org/src/commit/?id=b72ae900d4348118829fe04abdc11b620930c30f
> >
> > Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
>
> Daniel
>

[-- Attachment #1.2: Type: text/html, Size: 1761 bytes --]

[-- Attachment #2: Type: text/plain, Size: 141 bytes --]

_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Re: [PATCH] bsd: Fix type passed for the kernel

[Daniel Kiper]

On Tue, Mar 04, 2025 at 04:45:39PM +0300, Vladimir 'phcoder' Serbinenko wrote:
> Le mar. 4 mars 2025, 16:25, Daniel Kiper <dkiper@net-space.pl> a écrit :
>      On Mon, Mar 03, 2025 at 12:04:31AM +0300, Vladimir Serbinenko wrote:
>      > FreeBSD loader always passes "elf kernel". -CURRENT kernel accepts
>      only
>
>      What is "-CURRENT"?
> Basically HEAD/master in FreeBSD world.

Could you use HEAD/master then? For those less familiar with FreeBSD world...

>      > "elf kernel", older kernel accepts either.
>
>      You repeat "elf kernel" twice. I think something is off here...
> No, it's correct. We pass elf64 kernel but FreeBSD passes and across only elf
> kernel

It would be nice if you put that in the commit message too.

Daniel

_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel