From nobody Sat Apr 25 15:08:49 2026 X-Original-To: dev-commits-src-main@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 4g2tWq0bkvz6bfdf for ; Sat, 25 Apr 2026 15:08:55 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2tWp51kbz3n6V for ; Sat, 25 Apr 2026 15:08:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777129734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lhUHckGC9+TCjA7UkJgIj8Ebcj0xs0v1QDS8t/yiRtI=; b=tq7ZgHu5IKEb73l1k8xuwdYCDdvAxP72yGYzC47H/vRkD2ht1jIW8mOqOBUzZjhLbO/YT0 1Y6TZgFBVxIKHlVtQ3eEcn0qk90FiiqmCToE/qQdG4+Qu0KUvmsQPGiBYwh59ZmTy6+qHn 4YM3he/qua+YKc481ALfx/CnDkbj5plOygP/H95zPMMGo2dLU/mOTG0HjHGrEMPX7jmMMl lwsk4mkCt2hyrtEj1547bIRiPKLjGUWn6bvflSmAoLCF3QZXJiEHtXydDN6OA+OxtUBlkw 5PSPZJqJerY8yHYPZHfxbluCzLAZBFqAA3LIRU3TCS951+6CcgC2w8nq+LjjJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777129734; a=rsa-sha256; cv=none; b=YGIZi6Fm7dnxTkOZtWhlk6uk4ejVCtOapQeuhW7IavyisiKAumChTD3dSL2yrTZrsyalVw 7JDPf047hJaKnDdsHFWwAK+8X8hwFCHgKezhSPRxbkQjFVWv6Vb+NYol7is7yEukYFp6UQ OvVA6KTaooXrvK+GIBQ0WXKKT3e7LvOSlwouj71s5DCZTGyZ3wJ/Jd8kT3+j+rLQ8Svu8n PLNPSrTS7RO1gU2AfLzk/ouE4fH8GvGVVGuei0NmH0xzpXNHKQ5UfQdfD311P80U/iqpdx 8ZMJGaAvLW6cCKH1Prb7ix2hyypkjRlLsYORhQTaJFo1onqoJMYbHBFfjS99ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777129734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lhUHckGC9+TCjA7UkJgIj8Ebcj0xs0v1QDS8t/yiRtI=; b=qZdBEq38JzEW+3Lkj0UklZcffxbmVZUsexTe+qiq2KpXCZOPx0ABvvqqyPhmI7merpCmDx rFH2zO21NuFkxCGyLNuG6QXFnVNo6zkDzshwv4BLWx3wjOyp+zbgzkeb+pFs5+qOtYsTQX muUbSf5FLT6i1hSSfMC4ctaJYzcc40IQ4K4zVz56z93wdF0GyivH9VkT8tK9hGG5shIP0u YmOk1pkUj6aUlhleemnc8uQpFskXRf8NHySMHKLfIdLVGDJcVyyVsdsalY5udAIIsP6i2P 2ehdZBX2o4BGn/ZJ8154dxSdWmRzORHiSm8SLAF0FPiYAMy4eHKVOOwE81XXPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2tWp3tFFzfBF for ; Sat, 25 Apr 2026 15:08:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bdaf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 15:08:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Paarth Shirsat From: Benedict Reuschling Subject: git: ed82c433efee - main - Revert "loader.efi(8): Document LoaderEnv and NextLoaderEnv EFI variables" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed82c433efee1080fc5587325754afd6fcabd5d6 Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 15:08:49 +0000 Message-Id: <69ecd901.3bdaf.33dd995a@gitrepo.freebsd.org> The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/src/commit/?id=ed82c433efee1080fc5587325754afd6fcabd5d6 commit ed82c433efee1080fc5587325754afd6fcabd5d6 Author: Paarth Shirsat AuthorDate: 2026-04-25 15:06:39 +0000 Commit: Benedict Reuschling CommitDate: 2026-04-25 15:08:17 +0000 Revert "loader.efi(8): Document LoaderEnv and NextLoaderEnv EFI variables" This reverts commit cf7d4b04e9ae890f2a0f5811234e926f75a0c237. I attributed the wrong author of the patch. --- stand/man/loader.efi.8 | 41 ++++------------------------------------- 1 file changed, 4 insertions(+), 37 deletions(-) diff --git a/stand/man/loader.efi.8 b/stand/man/loader.efi.8 index 32729ff519a2..8bb88dd2e24f 100644 --- a/stand/man/loader.efi.8 +++ b/stand/man/loader.efi.8 @@ -217,47 +217,14 @@ functionality where we use the video console if a keyboard is connected and a serial console otherwise. .Ss Additional Environment Variables .Nm -can set variables early in startup from a file on the EFI partition. -By default, that file is -.Pa /efi/freebsd/loader.env . -It can be changed by setting the FreeBSD EFI variable -.Va LoaderEnv , -as in: -.Bd -literal -offset indent -echo -n /efi/freebsd/alt.env | efivar -w -t 7 \\ - -n cfee69ad-a0de-47a9-93a8-f63106f8ae99-LoaderEnv -.Ed -.Pp -After that is executed, the file -.Pa /efi/freebsd/alt.env -is used instead of -.Pa /efi/freebsd/loader.env . -See -.Xr efivar 8 -for more information on setting EFI variables. -.Pp -The EFI variable -.Va NextLoaderEnv -can be set to the pathname of a second startup file. -That variable is deleted immediately after its value is retrieved, -so setting it will affect only the next boot attempt. -For either variable, a missing file is silently ignored. -.Pp -Only simple variables can be set in the startup file. +loads some extra variables early in startup from +.Pa /efi/freebsd/loader.env +from the EFI partition. +Only simple variables can be set here. It can be useful to specify the root filesystem: .Bd -literal -offset indent rootdev=disk0s1a .Ed -.Pp -The startup file contains a series of assignments separated by spaces, -tabs, or newlines. -Quotes are not given any special treatment. -If no -.Li =value -is given, the value -.Li 1 -is used. -Invalid syntax and the like are silently ignored. .Ss Staging Slop The kernel must parse the firmware memory map tables to know what memory it can use.