From nobody Sat Oct 24 01:18:04 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jBMT93Klsz6wqVl for ; Sat, 24 Oct 2026 01:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jBMT86fBwz4KwP for ; Sat, 24 Oct 2026 01:18:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792804684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mr+YTv1Yh/ZZuI2aLu9GchZZ0Nu+9MhAO9udE+TVJU8=; b=la8OZJ//+g6UJCk0SbWwH+fVwM92vm33hgGOdnTq3ZhG18NpXVu8Ug2uUgqSScvGkyEQxL qXfYl9SPrOfXXLkAhh0sumwmeb4BH3VxmS/tw1YO9rFR40udAVYAyx6gk3jyOm93PaPJR7 NcY6QF4I19Nss5IU982V2T56ECJvR+qV3bkrcOX+kOi6szh8MbuhRxtHTrtutvLRziSQO2 mkWM6jRLV/fmTzyYA3VV7obEmBb1zt1L558BNCL8KImHX/CLHDxtgMDG0aXJ14TipKMIDs 8DcJXuwoaiW+MOsuOb8KIf2nr68DJgES1yJHptdrn81YeN2lMy/e7//ESH/Xvg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792804684; b=eX/2Z4BCOdYC642IMO/HOpItfonGb5iKpDkUFaQw4DgVgNdiPwEZUN7lN3f8seJ1Pmu3RE BQX/2QfPOOyhDcAx7XKHWGX4ETFcNF/GdC8D/8A+nDig32gRsOy0tx8zeSAblzyijHyfAG +F3oelAgaVpsrZsDbBwJsNyomUzy4Mki1+Bnc4Z4emCP4TMWJXQ7Ave66Z6OvsfokPxumG QwlChQRzt4eShcevkvjntplAbKl1+8bNmlm9Ax1GMDg0rYa+bmh/HWf3h0SGQaM+nSj6bq UdCByEdtQilgPo+fcEiz0DxSjBsramn6Wtvz+dHRwETOS/BF8NF8N0v2YCZj4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792804684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mr+YTv1Yh/ZZuI2aLu9GchZZ0Nu+9MhAO9udE+TVJU8=; b=gkG+pfr25gcKaWZmhEypcCvRHbBtMzc2PooLdeZvfp0TutSvY1VEw5X9E3dyWlvTGGLuhx axj3E1RKABW06NJlODAJUb1kSbObSEaeOMnGnj0JxU7tbVsxtdGTrQvKT3/RQYX9GCuyB6 uX8tu57dknCPNtuZwRX9dwkhgqjdJVD+sOkFKAgnbk+MCwEtN1gtoh99PW5v6umtvIdHor wUEkQGz7sZBx6koA1aVrzBDcQiXTzzqZ77r2hRbQn0CwuqVYy6BhmpZsvfe6fJ20X19G7F 3qSEP6Qp2Tdvi6JBuTd7zNZWwGpunzL8pbf5f5e6JLrvAMfbX6FlK43xm7fCig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jBMT85lpLzvS8 for ; Sat, 24 Oct 2026 01:18:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 232b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Oct 2026 01:18:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: ea041ed323ee - stable/15 - loader.efi: devinit() just after parsing args instead List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ea041ed323eee97c303283a8e7f477ca2868f1a8 Auto-Submitted: auto-generated Date: Sat, 24 Oct 2026 01:18:04 +0000 Message-Id: <6adc074c.232b3.206f0173@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ea041ed323eee97c303283a8e7f477ca2868f1a8 commit ea041ed323eee97c303283a8e7f477ca2868f1a8 Author: Kyle Evans AuthorDate: 2026-10-08 02:16:28 +0000 Commit: Kyle Evans CommitDate: 2026-10-24 01:17:42 +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 (cherry picked from commit 78887369c47fda5707ef72ef46a1c903df5b7cae) --- stand/efi/loader/main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 4ff60e770113..7411f7b7c45c 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -1268,8 +1268,6 @@ main(int argc, CHAR16 *argv[]) "failures\n", i); } - devinit(); - /* * Detect console settings two different ways: one via the command * args (eg -h) or via the UEFI ConOut variable. @@ -1280,6 +1278,12 @@ main(int argc, CHAR16 *argv[]) howto |= RB_SERIAL | RB_MULTIPLE; howto &= ~RB_PROBE; + /* + * We want to initialize after giving loader args a chance to elect a + * different console than what we autodetect. + */ + devinit(); + /* * Read additional environment variables from the boot device's * "LoaderEnv" file. Any boot loader environment variable may be set