From owner-svn-src-head@freebsd.org Wed Feb 21 16:57:04 2018 Return-Path: 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 69132F14DBF; Wed, 21 Feb 2018 16:57:04 +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 167BD86217; Wed, 21 Feb 2018 16:57:04 +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 116561B35F; Wed, 21 Feb 2018 16:57:04 +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 w1LGv3Ge074209; Wed, 21 Feb 2018 16:57:03 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1LGv3X2074208; Wed, 21 Feb 2018 16:57:03 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802211657.w1LGv3X2074208@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 21 Feb 2018 16:57:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329733 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 329733 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Feb 2018 16:57:04 -0000 Author: kevans Date: Wed Feb 21 16:57:03 2018 New Revision: 329733 URL: https://svnweb.freebsd.org/changeset/base/329733 Log: lualoader: Make kernel autodetection contingent on loader.conf(5) var Instead of based it off of whether 'kernels' was specified, base it off of a new variable: kernels_autodetect. If set to yes, we'll run the autodetection bits and add any detected kernels to the already existing list *after* both 'kernel' and 'kernels'. Modified: head/stand/lua/core.lua Modified: head/stand/lua/core.lua ============================================================================== --- head/stand/lua/core.lua Wed Feb 21 16:51:02 2018 (r329732) +++ head/stand/lua/core.lua Wed Feb 21 16:57:03 2018 (r329733) @@ -189,6 +189,7 @@ end function core.kernelList() local k = loader.getenv("kernel") local v = loader.getenv("kernels") + local autodetect = loader.getenv("kernels_autodetect") or "" local kernels = {} local unique = {} @@ -207,9 +208,12 @@ function core.kernelList() unique[n] = true end end + end - -- We will not automatically detect kernels to be displayed if - -- loader.conf(5) explicitly set 'kernels'. + -- Base whether we autodetect kernels or not on a loader.conf(5) + -- setting, kernels_autodetect. If it's set to 'yes', we'll add + -- any kernels we detect based on the criteria described. + if autodetect:lower() ~= "yes" then return kernels end