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'.
This commit is contained in:
parent
24433f00ea
commit
3889e6cd04
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=329733
@ -189,6 +189,7 @@ end
|
|||||||
function core.kernelList()
|
function core.kernelList()
|
||||||
local k = loader.getenv("kernel")
|
local k = loader.getenv("kernel")
|
||||||
local v = loader.getenv("kernels")
|
local v = loader.getenv("kernels")
|
||||||
|
local autodetect = loader.getenv("kernels_autodetect") or ""
|
||||||
|
|
||||||
local kernels = {}
|
local kernels = {}
|
||||||
local unique = {}
|
local unique = {}
|
||||||
@ -207,9 +208,12 @@ function core.kernelList()
|
|||||||
unique[n] = true
|
unique[n] = true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
-- We will not automatically detect kernels to be displayed if
|
-- Base whether we autodetect kernels or not on a loader.conf(5)
|
||||||
-- loader.conf(5) explicitly set 'kernels'.
|
-- 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
|
return kernels
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user