Author: kevans
Date: Sat Oct 27 04:10:42 2018
New Revision: 339805
URL: https://svnweb.freebsd.org/changeset/base/339805
Log:
lualoader: Always return a proper dictionary for blacklist
If module_blacklist isn't specified, we have an empty blacklist; effectively
the same as if module_blacklist="" were specified in loader.conf(5).
This was reported when switching to a BE that predated the module_blacklist
introduction, but the problem is valid all the same and likely to be tripped
over in other scenarios.
Reported by: bwidawsk
MFC after: 3 days
Modified:
head/stand/lua/config.lua
Modified: head/stand/lua/config.lua
==============================================================================
--- head/stand/lua/config.lua Sat Oct 27 03:37:14 2018 (r339804)
+++ head/stand/lua/config.lua Sat Oct 27 04:10:42 2018 (r339805)
@@ -266,12 +266,12 @@ local function isValidComment(line)
end
local function getBlacklist()
+ local blacklist = {}
local blacklist_str = loader.getenv('module_blacklist')
if blacklist_str == nil then
- return nil
+ return blacklist
end
- local blacklist = {}
for mod in blacklist_str:gmatch("[;, ]?([%w-_]+)[;, ]?") do
blacklist[mod] = true
end
_______________________________________________
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"
