Author: kevans
Date: Thu Aug 30 13:29:32 2018
New Revision: 338394
URL: https://svnweb.freebsd.org/changeset/base/338394
Log:
lualoader: fix color usage
Resetting to the default color scheme was done prior to reading the config.
This is bogus; colors may only be declined by the user with the
loader.conf(5) variable "loader_color", so such a request for no color will
not be completely honored as we reset to the default color scheme
unconditionally.
Approved by: re (rgrimes)
Modified:
head/stand/lua/loader.lua
Modified: head/stand/lua/loader.lua
==============================================================================
--- head/stand/lua/loader.lua Thu Aug 30 01:38:32 2018 (r338393)
+++ head/stand/lua/loader.lua Thu Aug 30 13:29:32 2018 (r338394)
@@ -42,15 +42,14 @@ local password = require("password")
-- need it.
local menu
+try_include("local")
+
+config.load()
-- Our console may have been setup for a different color scheme before we get
-- here, so make sure we set the default.
if color.isEnabled() then
printc(color.default())
end
-
-try_include("local")
-
-config.load()
if not core.isMenuSkipped() then
menu = require("menu")
end
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
