d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lualoader: Fix menu skipping with loader.conf(5) vars

Browse Source 
Earlier efforts to stop loading the menu broke the ability to skip the menu
with, e.g., beastie_disable in loader.conf(5) as it was decided before
configuration was read.

Defer bringing in the menu module until we've loaded configuration so that
we can make a more informed decision on whether the menu should be skipped
or not.
This commit is contained in:
Kyle Evans 2018-04-06 15:19:48 +00:00
parent 4a432d6fa5
commit 814a016d28
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stand/lua/loader.lua
View File

@ -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