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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
