Author: kevans
Date: Sat Mar 31 23:49:00 2018
New Revision: 331855
URL: https://svnweb.freebsd.org/changeset/base/331855
Log:
lualoader: Don't assume that {module}_load is set
The previous iteration of this assumed that {module}_load was set. In the
old world order of default loader.conf(5), this was probably a safe
assumption given that we had almost every module explicitly not-loaded in
it.
In the new world order, this is no longer the case, so one could delete a
_load line inadvertently while leaving a _name, _type, _flags, _before,
_after, or _error. This would have caused a confusing Lua error and borked
module loading.
Modified:
head/stand/lua/config.lua
Modified: head/stand/lua/config.lua
==============================================================================
--- head/stand/lua/config.lua Sat Mar 31 23:40:05 2018 (r331854)
+++ head/stand/lua/config.lua Sat Mar 31 23:49:00 2018 (r331855)
@@ -205,6 +205,9 @@ local function loadModule(mod, silent)
local status = true
local pstatus
for k, v in pairs(mod) do
+ if v.load == nil then
+ goto continue
+ end
if v.load:lower() == "yes" then
local str = "load "
if v.flags ~= nil then
@@ -232,6 +235,7 @@ local function loadModule(mod, silent)
end
if v.error ~= nil then
cli_execute_unparsed(v.error)
+
end
status = false
end
@@ -249,6 +253,7 @@ local function loadModule(mod, silent)
-- print("Skipping module '". . k .. "'")
-- end
end
+ ::continue::
end
return status
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
