From nobody Wed Jan 7 18:24:53 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 4dmbzn2vb1z6N9Pq for ; Wed, 07 Jan 2026 18:24:53 +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 4dmbzn256gz47V8 for ; Wed, 07 Jan 2026 18:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767810293; 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=rwkkCICX/yykRSc1i8KrUlS2SutTXpdMdQ942yji7qo=; b=ezOf3/xFhDCqjEkTGo4wDDI0xHH9dQiZKhiLkzLaDU2wTMUtdESdkn7olba4Lx004Gwbm0 iJikrg8cNHzCDqi1M2wzoWjUm8+P4AyII2iuPqr3vXkmi1ovdJZqJ+zzUDXU2BnQUsdcnr Z9P9qqdU9BFc1j8i2lGJZmmktPUy2Yp+nactl1qJ6NpAWRuCCRU+SJXT04+S3EIUOcBDRL qeVx0JmmgrcU50bLGYQe+FCZoQaae0PtAXp9ZUv+bXRaMnaBUqKdl3jyYDoGz3JJsmG6+6 Yn2p8k9LbB027e2aNsFMJmQa5XAHE4xgb2gCBstYjCi6Uuv/kdlLgILmbF+1Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767810293; 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=rwkkCICX/yykRSc1i8KrUlS2SutTXpdMdQ942yji7qo=; b=GnN10GvDnT/XGHAmw/iYTDWBWbsE6nsmNyvtH6VFtO2GRQSabAMDClD5lwZa6vSYDX3Fis giZ9pF7f5//JcIxWKDuVvXik6ba5ivyfSD6XJDv2+bbqtGISQlWc0HXOeGrqPdIP2Y8pQM nS40ZfJYaD3LL4KPRWAhdWRAwuo+eshNrK+PPwVzYTDYkRe+CoBFNxjU9yPvFAtGb9IacC 2n2EhYWG6LO1gwTQzvfKTZIFq686a7ANElPhI11DTJ64J8MpxgCzxt+o54GyhbfrETGExg 2EMfyaLEUwIQNz5UGuypLLjYw8fxhxkJV7UzLYP+/eCHgoaUih5GrlC0kqIvMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767810293; a=rsa-sha256; cv=none; b=a6cdcUT0wP0U+0pX2IWpzvXHDu8qtuRaGuQXp89E+1c9/+aodWaBfwhF8Xb9OQqGPhaBhE 6baaIK1dXHoRVR3sbJAT/ZYLB6X+ZuXMH+crXUr2fyxr12J0Lz2mc8BM6OjLV+IvaBxwi3 FFMidWs+lDqRsD3ZYfmwwyEas1Nld8ywOvvz74uSrfjeLAu+UH6VbfSXb0QN41OBw/FMOt GmVt9bXsMW00obziMx6AEt8wgavYhLRLEUdf2lYZ/UmQagFRHEPHSOtwNyeEEHnmM62seJ ymvxfJmu5GjOR3i2UmwB39DtAGDYAYJwiisKgpPWjMfUiJWigj6jHn06vyXBQg== 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 4dmbzn1Z7Rz144K for ; Wed, 07 Jan 2026 18:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a485 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 07 Jan 2026 18:24:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: e30086ab4c87 - main - lualoader: fix pruning of non-existent default kernel 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e30086ab4c8778ea70a3b19e83546ce1b4a16492 Auto-Submitted: auto-generated Date: Wed, 07 Jan 2026 18:24:53 +0000 Message-Id: <695ea4f5.3a485.58c3c65c@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e30086ab4c8778ea70a3b19e83546ce1b4a16492 commit e30086ab4c8778ea70a3b19e83546ce1b4a16492 Author: Kyle Evans AuthorDate: 2026-01-07 18:20:05 +0000 Commit: Kyle Evans CommitDate: 2026-01-07 18:20:05 +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 [...]") --- stand/lua/core.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/stand/lua/core.lua b/stand/lua/core.lua index ad417e5f97e5..b1b321d10868 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