From nobody Wed Apr 8 12:50:10 2026 X-Original-To: dev-commits-src-all@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 4frNFh03Hnz6Y4xS for ; Wed, 08 Apr 2026 12:50:16 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frNFg6frMz3V24 for ; Wed, 08 Apr 2026 12:50:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775652615; 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=btYRAybNFGgAjBDsBz1CKwAVPH7HdLb3QbqFKZLX99w=; b=dexwP/kVYu5RkH1J7dVIFSX5Fc1ank+eXw9XXqqn2fhXGsEAFCHlu5EvUqQFiUMAaJiwuF E733IlOI5V+t3/dYqqmaoUyfvHs7MSFJ7gIJHmortWx48wFE/VmvfWCC+M93FMF53RAfv4 j+gNgOyRHtZXHBdmPPHB25GgdA3vZnoTc2ABQaUArF3xYRK2cPaYVFCycpQdGr4WpkqdwI TdCUax49mhvRf8LWyfT/S3faB2IojAqcOTmaxBsf4wltlKVeNR36phVT1JnqPK1YnjJNeh /Sk44jRu4cnRyOe/U8EBTzfaaY1zXnBlp1530yo1R4NPf04Owwp6w6xG+R4CkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775652615; a=rsa-sha256; cv=none; b=hbPCEE54cAbai1NiQLHv1Lsw+IueATQBMzXFA7XwZf2HRMbthIui7tIw4qurFHQNzfn3aA FJqS2PW6x6UG2u10zlqV01+OkyrsUYKGhq2MwvXg9HWDbU8j/5f2mn6mI+LclRJvHzEm3v yYLMsm65FE7DjELNHwBCv6JrEnRWYP/jgQK1G+AoBVjo3nlOVXQZshavFM9DwKYEtG4IB/ dS7Y2RNdIu2sgBWZakG5lvzAKCG/C+/0U5hlOPQYAY5w9j4+g63YDKnd9/apKWAyVUnirA zx1dNw4CGbuCJ06FR0b/PsxHmfgegZizGsgwXO6DmuTsQDMOlmGI+FslW16UNQ== 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=1775652615; 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=btYRAybNFGgAjBDsBz1CKwAVPH7HdLb3QbqFKZLX99w=; b=VFT88WcsrNgeOMGgVbXowfvuYUdzfTFboBjvAIg/kY8XrRt/4KBli7hbtSk5Oa2nYfDG5z NXzxvF4j2b86vDAxnpnAkEUepqV8UEi6WmOwK379rmRrk6bYS3XYjkCyiIj6yMuiwxEe6O 2WiM6TlTfh1DoCH7i+aQkXfVOptb18kZLmulIdq8iiXlAl0GTdul0d4hZsyIBwmSBY2YkK nz18LIeFsUrtgmvJfdZ9tPtcl6nVxgmrlgrv50V0G3rn7w5ndzbEkYCboHwBbj8DmiRfiz B4+C7w1p7b5PIbTM+d+h+FXv5xV0gilfUaW6fI6CWGp/Go4GiJh+9rMWFwYiRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frNFg6BqJzB44 for ; Wed, 08 Apr 2026 12:50:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32959 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 12:50:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: bf0881060ecd - main - lualoader: allow the local module to filter out the BE list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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/main X-Git-Reftype: branch X-Git-Commit: bf0881060ecd75ce79683b82ebcd4809eadf7cf5 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 12:50:10 +0000 Message-Id: <69d64f02.32959.4abb16e1@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=bf0881060ecd75ce79683b82ebcd4809eadf7cf5 commit bf0881060ecd75ce79683b82ebcd4809eadf7cf5 Author: Kyle Evans AuthorDate: 2026-04-08 12:49:18 +0000 Commit: Kyle Evans CommitDate: 2026-04-08 12:49:58 +0000 lualoader: allow the local module to filter out the BE list This allows something like the following local.lua to install a filter to implement its own notion of hidden BEs using a naming convention of a leading dot to hide them: -- file: /boot/lua/local.lua local core = require("core") local function be_hide(be) if core.isSingleUserBoot() then -- All BEs are accepted for single-user return true end local name = be:match("/([^/]+)$") if not name then -- Accept malformed BEs, for whatever reason return true end return name:match("^%.") == nil end if core.bootenvFilter then -- Just in case we need to be compatible with older versions of -- core.lua without the filtering functionality. core.bootenvFilter(be_hide) end -- EOF Requested by: Marek Zarychta Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55359 --- stand/lua/core.lua | 20 ++++++++++++++++++-- stand/lua/core.lua.8 | 13 ++++++++++++- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/stand/lua/core.lua b/stand/lua/core.lua index 92cbd20b25a0..471e579619c7 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -305,6 +305,15 @@ function core.bootenvDefault() return loader.getenv("zfs_be_active") end +function core.bootenvFilter(func) + local oldf = core.bootenv_filter + + -- Filter contract: returns true if the BE should be kept, false if it + -- should be hidden. + core.bootenv_filter = func + return oldf +end + function core.bootenvList() local bootenv_count = tonumber(loader.getenv(bootenv_list .. "_count")) local bootenvs = {} @@ -332,11 +341,18 @@ function core.bootenvList() for curenv_idx = 0, bootenv_count - 1 do curenv = loader.getenv(bootenv_list .. "[" .. curenv_idx .. "]") if curenv ~= nil and unique[curenv] == nil then - envcount = envcount + 1 - bootenvs[envcount] = curenv unique[curenv] = true + + -- If we have a filter installed (by a local module), we + -- give it a chance to veto the BE. + if not core.bootenv_filter or + core.bootenv_filter(curenv) then + envcount = envcount + 1 + bootenvs[envcount] = curenv + end end end + return bootenvs end diff --git a/stand/lua/core.lua.8 b/stand/lua/core.lua.8 index de43d3e2b220..325320b2fce8 100644 --- a/stand/lua/core.lua.8 +++ b/stand/lua/core.lua.8 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 29, 2025 +.Dd April 8, 2026 .Dt CORE.LUA 8 .Os .Sh NAME @@ -164,6 +164,17 @@ is set in kernels will be autodetected from the current system. .It Fn core.bootenvDefault Returns the default boot environment, nil if unset. +.It Fn core.bootenvFilter func +Installs a filter +.Fa func +into +.Fn core.bootenvList . +If the +.Fa func +returns true, then the boot environment is retained in the list. +Otherwise, the boot environment is hidden. +The old filter, if any, is returned to allow the caller to compose a filter on +top of another filter. .It Fn core.bootenvList Returns a table of boot environments, or an empty table. These will be picked up using the