From owner-svn-src-head@freebsd.org  Wed Oct 24 02:02:38 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04D88107026D;
 Wed, 24 Oct 2018 02:02:38 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id A8A727C47C;
 Wed, 24 Oct 2018 02:02:37 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A39EC18582;
 Wed, 24 Oct 2018 02:02:37 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9O22bhd020101;
 Wed, 24 Oct 2018 02:02:37 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9O22bsR020100;
 Wed, 24 Oct 2018 02:02:37 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201810240202.w9O22bsR020100@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Wed, 24 Oct 2018 02:02:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r339677 - head/stand/lua
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/stand/lua
X-SVN-Commit-Revision: 339677
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Oct 2018 02:02:38 -0000

Author: kevans
Date: Wed Oct 24 02:02:37 2018
New Revision: 339677
URL: https://svnweb.freebsd.org/changeset/base/339677

Log:
  lualoader: unload upon kernel change if a kernel was previously loaded
  
  In the majority of cases, a kernel is not loaded before we hit the menu.
  However, if a password is set, we'll trigger autoboot and have loadelf'd
  beforehand. We also need to take into account one dropping to the loader
  prompt and twiddling with things manually; if they try to toggle through
  kernels, we'll assume they mean it.
  
  Reported by:	trasz
  MFC after:	 3 days

Modified:
  head/stand/lua/menu.lua

Modified: head/stand/lua/menu.lua
==============================================================================
--- head/stand/lua/menu.lua	Wed Oct 24 00:19:44 2018	(r339676)
+++ head/stand/lua/menu.lua	Wed Oct 24 02:02:37 2018	(r339677)
@@ -312,6 +312,9 @@ menu.welcome = {
 				    #all_choices .. ")"
 			end,
 			func = function(_, choice, _)
+				if loader.getenv("kernelname") ~= nil then
+					loader.perform("unload")
+				end
 				config.selectKernel(choice)
 			end,
 			alias = {"k", "K"},