From nobody Sun Apr 16 02:40:31 2023 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 4PzZDJ2YCgz45bYl; Sun, 16 Apr 2023 02:40:32 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PzZDJ1DGQz3QyQ; Sun, 16 Apr 2023 02:40:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681612832; 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=fYUtE5lXHeREZYba6faeEOsnqha4oUykxVzlFxcD7AQ=; b=X+/17sVKK4N9szWogVbHiKaQkXBckuWD+SDZ209qe2duhRKm0p2AdLz+H4Kap2TIgk1c/E DooqXKA0xc+HXseFGcRCjw0WKeVM1rv8fyKVS/mGMR0gHRaYtyIz4kX/iBqsbd0Zxn+VEE /7irFSlO6RA/j3x+DpgYGMaKYovvbffP/aYPsAOuD4NWI6jQU9YiN/Eq5K/8VabWi15Q6i LyBqEz7S+Qa/+uOp7GYHHd03X9HD396WvLOs2KIF7g5DtDO+V487W0U2yrKvr9pirqA4Ap D+NdkbmPfzKt6gUvGBLfi67R8xNueXZgUPwYF0ZBGn2PdMS3oIgaRl1zxg6EBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681612832; 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=fYUtE5lXHeREZYba6faeEOsnqha4oUykxVzlFxcD7AQ=; b=oy8+chXxaXeq6cC0zmViVHoidzxfKyeuurduY4cNmoPdnfcRUP2V+vhNnb4Oxzn9Ok6HG4 fPqitq51aczlId+xiKiN9SC7VLXAarqj2FDdc2EMdxqbUpidK5FpxFopjzKLzOEISjKMom nLdJCr0qbDGfrxkt79d0Y4Y1tk7qLewuPxj1Fm3nKgkli0PliFH3mnhBEFawXsxYm8SXCW WCE+/EQHBXAYGCxNa/c6O33yIsxfmzXSvapK4emv+lseH9pQaROf1oc4l+0PfVEFMK81UD xPCKLrO7q3ukEcaEAzweeny1oqzlcoXvw7znNbgIyyS0mTwXQ33l/+6Q/Sbl+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681612832; a=rsa-sha256; cv=none; b=xc/Qi3fBdB8zwumS998/wbc2X7j92+HTQqmGCB+/6ofAO6yr2RJEbY6PIGB/5PHD+FEo7H cLtzOVF9Vsmyj8xtnrVlcyFjPVJab/23oqfG+w6OJ28UECBNjTwiaovGS+bEq3IgHpShfu m/c21rx7tDJs8eRuQhOQDNDjde+Sxq+vaEVIrm2YKWUWMo2aKDjapMDzAoM9ATcSDDh+oB l5HggcLDXpATAVve6daDoeibIkoEH47VnFfGJA+G6T7x3/+RZ13D96odMQo0KW1gHVMqXo wAYwhyznCoZiB86KISjDio6sGqrYzYsp/UmUfAU4cZR+k/+QMT1mFagOoZW00w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PzZDJ05z5zWC3; Sun, 16 Apr 2023 02:40:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33G2eVOc005732; Sun, 16 Apr 2023 02:40:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33G2eVmI005731; Sun, 16 Apr 2023 02:40:31 GMT (envelope-from git) Date: Sun, 16 Apr 2023 02:40:31 GMT Message-Id: <202304160240.33G2eVmI005731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: d7584aa09fcf - main - loader: lua: unload the kernel when changing BEs 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d7584aa09fcf8d96544e5bfb3ea78f50d7720c0c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d7584aa09fcf8d96544e5bfb3ea78f50d7720c0c commit d7584aa09fcf8d96544e5bfb3ea78f50d7720c0c Author: Cyrus Rahman AuthorDate: 2023-04-16 02:27:53 +0000 Commit: Kyle Evans CommitDate: 2023-04-16 02:39:52 +0000 loader: lua: unload the kernel when changing BEs Usually the kernel is loaded later, but there are circumstances where it could have been loaded earlier than changing BEs. Unload anything that is already there so that we know we're using artifacts from the proper environment. PR: 265471 Reviewed by: kevans MFC after: 3 days --- stand/lua/menu.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index 400dbf3d469b..4a326cb54bb9 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -58,6 +58,9 @@ local function bootenvSet(env) loader.setenv("vfs.root.mountfrom", env) loader.setenv("currdev", env .. ":") config.reload() + if loader.getenv("kernelname") ~= nil then + loader.perform("unload") + end end local function multiUserPrompt()