aboutsummaryrefslogtreecommitdiff
path: root/stand/lua
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2018-04-06 15:19:48 +0000
committerKyle Evans <kevans@FreeBSD.org>2018-04-06 15:19:48 +0000
commit814a016d28f66cac4a7cd371f38fb6eae72265c6 (patch)
treec2655a39b9f626ef20d2944add97e26dda7b1eab /stand/lua
parent4a432d6fa553a2e76645ea6db81b35f52ce839ff (diff)
Notes
Diffstat (limited to 'stand/lua')
-rw-r--r--stand/lua/loader.lua10
1 files changed, 6 insertions, 4 deletions
diff --git a/stand/lua/loader.lua b/stand/lua/loader.lua
index 81034aa9a671..4af12aa23396 100644
--- a/stand/lua/loader.lua
+++ b/stand/lua/loader.lua
@@ -37,15 +37,17 @@ require("cli")
local color = require("color")
local core = require("core")
local config = require("config")
-local menu
-if not core.isMenuSkipped() then
- menu = require("menu")
-end
local password = require("password")
+-- The menu module will be brought in after config has loaded if we actually
+-- need it.
+local menu
try_include("local")
config.load()
+if not core.isMenuSkipped() then
+ menu = require("menu")
+end
if core.isUEFIBoot() then
loader.perform("efi-autoresizecons")
end