From 3889e6cd04b6126c8380c0dff397b09d6ed45eae Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Wed, 21 Feb 2018 16:57:03 +0000 Subject: [PATCH] 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'. --- stand/lua/core.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stand/lua/core.lua b/stand/lua/core.lua index bff772f5ff0b..fc9431585c24 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -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