From owner-svn-src-head@freebsd.org  Wed Feb 21 14:07:54 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 96F51F048CB;
 Wed, 21 Feb 2018 14:07:54 +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 4A4147C672;
 Wed, 21 Feb 2018 14:07:54 +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 45412197C2;
 Wed, 21 Feb 2018 14:07:54 +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 w1LE7s49087562;
 Wed, 21 Feb 2018 14:07:54 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1LE7sLk087561;
 Wed, 21 Feb 2018 14:07:54 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201802211407.w1LE7sLk087561@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, 21 Feb 2018 14:07:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r329709 - head/stand/lua
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/stand/lua
X-SVN-Commit-Revision: 329709
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.25
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, 21 Feb 2018 14:07:54 -0000

Author: kevans
Date: Wed Feb 21 14:07:53 2018
New Revision: 329709
URL: https://svnweb.freebsd.org/changeset/base/329709

Log:
  lualoader: Don't autodetect kernels if 'kernels' is explicitly set

Modified:
  head/stand/lua/core.lua

Modified: head/stand/lua/core.lua
==============================================================================
--- head/stand/lua/core.lua	Wed Feb 21 14:05:13 2018	(r329708)
+++ head/stand/lua/core.lua	Wed Feb 21 14:07:53 2018	(r329709)
@@ -188,7 +188,7 @@ end
 
 function core.kernelList()
 	local k = loader.getenv("kernel")
-	local v = loader.getenv("kernels") or ""
+	local v = loader.getenv("kernels")
 
 	local kernels = {}
 	local unique = {}
@@ -199,12 +199,18 @@ function core.kernelList()
 		unique[k] = true
 	end
 
-	for n in v:gmatch("([^; ]+)[; ]?") do
-		if unique[n] == nil then
-			i = i + 1
-			kernels[i] = n
-			unique[n] = true
+	if v ~= nil then
+		for n in v:gmatch("([^; ]+)[; ]?") do
+			if unique[n] == nil then
+				i = i + 1
+				kernels[i] = n
+				unique[n] = true
+			end
 		end
+
+		-- We will not automatically detect kernels to be displayed if
+		-- loader.conf(5) explicitly set 'kernels'.
+		return kernels
 	end
 
 	-- Automatically detect other bootable kernel directories using a