aboutsummaryrefslogtreecommitdiff
path: root/stand/lua
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2018-06-12 03:44:34 +0000
committerKyle Evans <kevans@FreeBSD.org>2018-06-12 03:44:34 +0000
commit5d2791646b0161659f2fc2e4e2909c996ca0ffdb (patch)
tree777d3061336f1bba6d075f00f29c862fde5e8591 /stand/lua
parent22e6ecf367bb9f2dbfba2c662ad09467322a54de (diff)
Notes
Diffstat (limited to 'stand/lua')
-rw-r--r--stand/lua/color.lua4
-rw-r--r--stand/lua/loader.lua11
2 files changed, 8 insertions, 7 deletions
diff --git a/stand/lua/color.lua b/stand/lua/color.lua
index 0e51908aebbb..994e7cb1edcb 100644
--- a/stand/lua/color.lua
+++ b/stand/lua/color.lua
@@ -69,7 +69,7 @@ function color.resetfg()
if color.disabled then
return ''
end
- return core.KEYSTR_CSI .. "39m"
+ return color.escapefg(color.WHITE)
end
function color.escapebg(color_value)
@@ -83,7 +83,7 @@ function color.resetbg()
if color.disabled then
return ''
end
- return core.KEYSTR_CSI .. "49m"
+ return color.escapebg(color.BLACK)
end
function color.escape(fg_color, bg_color, attribute)
diff --git a/stand/lua/loader.lua b/stand/lua/loader.lua
index 4af12aa23396..95cff013e652 100644
--- a/stand/lua/loader.lua
+++ b/stand/lua/loader.lua
@@ -42,6 +42,12 @@ local password = require("password")
-- need it.
local menu
+-- 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()
@@ -51,11 +57,6 @@ end
if core.isUEFIBoot() then
loader.perform("efi-autoresizecons")
end
--- 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
password.check()
-- menu might be disabled
if menu ~= nil then