From nobody Tue Jan 20 04:09:43 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 4dwDP43HFhz6NwHY for ; Tue, 20 Jan 2026 04:09:44 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwDP36McJz3WCm for ; Tue, 20 Jan 2026 04:09:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882183; 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=p4slsG30DaePhKdFQ70IrFz/FKUiEn1eAk6Ml37Z8aQ=; b=KQ58nrCGIsdqko9cXMc7Roi1tPvBO5KJFoupx82a+DVvmS/3kkchEosv+ULnxN3C9Ua29i eDMut3m/oLpfyL9W1n3BFxUJZbolOQ+yST1r2MZYgqXgsKbbNsUKfZ5TtWO9Sa3Gk0Z23D gNUBEHTmmAB9hEVQ1O6QG5LJIZyENr+lb7YP0MRH0Q+WB/emvbk0TEpp1F/ndwQ5w6NjA8 bxYEua7AxbNZZxv/PDTYLVpiS5RJ3yCyQkXncXoYSxL3Iw/SBS/C4akLxZ3H4LPlD/ZSi4 dHVqoBvdhdqHeBeTRPUptFe6byug6kCSjCPviZgUz+skFJ7EHsi2+Pnmj8nIRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882183; 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=p4slsG30DaePhKdFQ70IrFz/FKUiEn1eAk6Ml37Z8aQ=; b=BDh1+p59KpVwH1jJT2duS56dlru5TsGEqCM+HksL1fp0li9TQRSrtWaf7Zr+zSkk2LAKMN x5OcDBjAu1o4jhzAMDWfpiWEDLgO7uem16JeH8TgrV/oDjLk3dUGx5s6KDUiC8T3SvZLT/ L2yh3IWKCoQXezKdGS3uknvqzjImHNoJm+hP5sqnfgZwjfnkDX4u5Waxrg8JI2vfG1veal QHHNuttBkLgrfiTWKeKnnpey5ilvEAO0jRaMFMckizhIek26kChzigTiIoFk0144yAYkJJ qMFS92AGMmdDdM21nA/ibm5+84KCvyx3n3C5MQl6R8gQUwgmAXFpJe7FZN03zA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768882183; a=rsa-sha256; cv=none; b=pdt633qb5ieqJ4++44edDMXxzF5zv2pRuKhGW8yC7kBJh2WX/zhLznQSwlwR1sc7yPXcGe nTMw5DPCGjcSA91jdEf7cfW5L+U2Yz/4S2hRUpzeDpiXF7IlW2TRl+DrqegeE1OUzhAcqg NwEIVzVeIolh26qbWBgAC0RK40eXXtOxOjsvKx3RRztx0BQkR66JWcyB9auoerqMpRzdKq PFRXIsuncChOk3o68NqT/pMOHgUID3+4PcZvb7xUNQZ15um81J/LMxYzPXVE4XNUT+AdVT 3qgksHqnUvVKfteNYO4ZSlf6vuWe8xFsA4b1F4uxGK+CGPmpHINqUBvKfrzJHA== 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 4dwDP35srvz11r9 for ; Tue, 20 Jan 2026 04:09:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26a64 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 04:09:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 4f0342cf84db - stable/14 - lualoader: fix pruning of non-existent default kernel List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f0342cf84dbe4fadbfea02e3279aafab36ea848 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 04:09:43 +0000 Message-Id: <696f0007.26a64.304dec79@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4f0342cf84dbe4fadbfea02e3279aafab36ea848 commit 4f0342cf84dbe4fadbfea02e3279aafab36ea848 Author: Kyle Evans AuthorDate: 2026-01-07 18:20:05 +0000 Commit: Kyle Evans CommitDate: 2026-01-20 04:08:11 +0000 lualoader: fix pruning of non-existent default kernel Removing the kernel from the list of available kernels is sufficient to avoid rendering it in the list, but we need more for booting to actually work. Notably, the 'kernel' loader.conf var was left intact to its default value, so if one didn't use the kernel selector in the menu then we'd try to boot the nonexistent 'kernel' instead of the new default (first autodetected). There's room to improve the error messages here, but for now let's just make it actually work correctly. PR: 292232 Fixes: d04415c520b03 ("loader: lua: remove the default kernel [...]") (cherry picked from commit e30086ab4c8778ea70a3b19e83546ce1b4a16492) --- stand/lua/core.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/stand/lua/core.lua b/stand/lua/core.lua index d66d9719fdcb..ccd8213a718d 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -287,6 +287,12 @@ function core.kernelList() kernels[n] = kernels[n + 1] end end + + -- The config/boot bits use the env var as a fallback if the + -- menu's kernel selector remains untouched, so we want to + -- update our notion of the default kernel to one that is + -- actually present. + loader.setenv("kernel", kernels[1]) end core.cached_kernels = kernels