From nobody Tue Jan 20 04:09:25 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 4dwDNk09t6z6NwDp for ; Tue, 20 Jan 2026 04:09:26 +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 4dwDNj3cQDz3VX9 for ; Tue, 20 Jan 2026 04:09:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882165; 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=Nl3Q339xUCWjQay+WA1xHgQWuQBketjB3WYPSOcnZWk=; b=SUq1s94KanWYM9QxrjejzL7Ci668bg8RpxugJfkhZC2vacfaF4fY8amn4A71qc5747LV0/ x2fL9alXhC7lq+c8sfSK3lxLnSNlNcKt13iRDat/MX6hZpcdsSc1dhmw/ChDVWallwBqZQ bnOTAuFbmg/gAsc7Pe+ZaZKrwhCOyZjGJc57JK+u8cb5W+10io/DJGDlmEwWJqq3sIYb9i itm6XRRUEhlOJEoC2RHwaw/qWgI30Df/ag7Cl/df/PzJZc3Fhj0TgNg3pfcv0o6ObEKugI NXHk3/KQhgDfa5smMvxKw3XnEDIpcdCnbtSng7XFzPSASKMtVOQjSddhXsrUSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882165; 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=Nl3Q339xUCWjQay+WA1xHgQWuQBketjB3WYPSOcnZWk=; b=SMGZJPFzrSN6RS3c3NzRL+N7F3Awiob2gxmJZ3OVIRit7YepTnzqEe0Cp5/OfBju5esmpH Rx18QetvgJNBEcZs33B091oGAlpjJG70v6ae2wD52KUZ84pj8D5a0pn2zPxF6Zk98qmSSt X1SaJK6KYnMUw2o6fpvpiIXCBqSgyuw/Q4GFovCYjZFjCa5QatbwVHkKue+1K7DdnidKdP nLGBkHRUB6Aa23/s7nbitWc111QiZm7CyOihmGFl2qKzRUF6ZmNCZH7iyU5uYIQhKwxPrm dewCZfOi1v7RWzT8QoPjOxDYF4wcBYPQDd16p0Clo8WHmbZeqZffbI40eM5/NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768882165; a=rsa-sha256; cv=none; b=Gmqr6UYYvFtx4e/VG0hf4RRzWCcbn3cmQurmkk0X4AUVJAcu+6dwhUr8p5r2cjtkKpUL9a is6kERzfGUt7djN5V4kQzUk7ZsKbNAyz9YZ2+LO3AMQTgITd1c5x8wEflZOYLILl4hZL5p PZeVo1JqmoATqG/IpNgIWoyn53Io7cyEWp4E2REWg6eEe3xj0cKdcUtp1R/E7j82qRMpvw 9VrvORSlHxbt5glgSnfzWYfycWbfL/BQ/sHcmJMOtCav6zlhSNTg23e+xlBrne/v/CaWR1 Qc/y0WMNsN5GBQ+fMp+kZIhuVU3mbxRtoDrhcumFfdudaOZ62M0tGwfvphWoDw== 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 4dwDNj39jWz12B5 for ; Tue, 20 Jan 2026 04:09:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 278e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 04:09:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 6dabfd3efefa - stable/15 - lualoader: fix pruning of non-existent default kernel 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 6dabfd3efefaeb2bc24b8f16e1c5aae8dedc4d0c Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 04:09:25 +0000 Message-Id: <696efff5.278e3.48e6fe5c@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6dabfd3efefaeb2bc24b8f16e1c5aae8dedc4d0c commit 6dabfd3efefaeb2bc24b8f16e1c5aae8dedc4d0c Author: Kyle Evans AuthorDate: 2026-01-07 18:20:05 +0000 Commit: Kyle Evans CommitDate: 2026-01-20 04:04:46 +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 f42be6fbebb7..d06f41511a47 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -289,6 +289,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