From 5eba69a061daad999317c1dae42f29efcc66d26a Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Tue, 15 Oct 2024 05:11:02 -0600 Subject: [PATCH] loader.efi: |= the boot flags how how is assumed to be 0, so we directly assign to it. It might not always be 0, so or-in these bits. Sponsored by: Netflix Reviewed by: bz, andrew Differential Revision: https://reviews.freebsd.org/D47084 (cherry picked from commit 94164106c0a7e18b5ac7a1508fed179b6e6939f9) --- stand/efi/loader/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 272750d5d05..edcd75adf20 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -777,9 +777,9 @@ parse_uefi_con_out(void) * all the other more common cases). */ if (efi_has_gop()) - how = RB_MULTIPLE; + how |= RB_MULTIPLE; else - how = RB_MULTIPLE | RB_SERIAL; + how |= RB_MULTIPLE | RB_SERIAL; setenv("console", "efi,comconsole", 1); goto out; }