git: 78887369c47f - main - loader.efi: devinit() just after parsing args instead

The branch main has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=78887369c47fda5707ef72ef46a1c903df5b7cae

commit 78887369c47fda5707ef72ef46a1c903df5b7cae
Author:     Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2026-10-08 02:16:28 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2026-10-08 02:16:28 +0000

    loader.efi: devinit() just after parsing args instead
    
    c4640126f1160 ("loader.efi: Apply command-line DHCP overrides earlier")
    was really good, but moving it just one statement earlier is even
    better.  polarian on Libera describes a GELI setup on a system that
    doesn't advertise a serial console via ConOut.  They don't have serial
    input at the point that they would get prompted for the GELI passphrase,
    but if we parse args just before devinit() then he can override the
    console with `efibootmgr -e`.  This gives UEFI one advantage over BIOS
    loader, as /boot.config isn't available to provide that kind of override
    if your impediment is GELI.
    
    We also considered reading loader.env earlier, but we have a chicken/egg
    problem in that we must have probed for the ESP to be able to open() it.
    We would instead need a devinit_early() and devinit_late() scheme that
    allows GELI probing to be deferred until the later pass, after reading
    loader.env to pick up the console override.  That's an idea I'd still
    like to discuss because it's more robust than hoping that firmware won't
    wipe out our efibootmgr(8) entries.
    
    Tested by:      polarian on Libera
    Reviewed by:    imp
    Differential Revision:  https://reviews.freebsd.org/D60449
---
 stand/efi/loader/main.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c
index bfb221ee80f5..bac8cab552f5 100644
--- a/stand/efi/loader/main.c
+++ b/stand/efi/loader/main.c
@@ -1380,14 +1380,20 @@ main(int argc, CHAR16 *argv[])
 	 */
 	efiblk_memdisk_preload();
 
-	devinit();
-
 	/*
 	 * Parse command line arguments before any operation that may configure
 	 * the network so DHCP overrides are available on the first attempt.
 	 */
 	howto = parse_args(argc, argv);
 
+	/*
+	 * We want to initialize after giving loader args a chance to elect a
+	 * different console than what we autodetect, but we need efinet to
+	 * have initialized before netbooting an initmd has any chance of
+	 * working.
+	 */
+	devinit();
+
 	/*
 	 * If we didn't find a ipxe image, and we're netbooting, try to
 	 * download an initmd that the dhcp server tells us about.