Deleted Added
full compact
loader.lua (357191) loader.lua (360599)
1--
2-- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
3--
4-- Copyright (c) 2015 Pedro Souza <pedrosouza@freebsd.org>
5-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
6-- All rights reserved.
7--
8-- Redistribution and use in source and binary forms, with or without

--- 12 unchanged lines hidden (view full) ---

21-- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22-- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23-- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24-- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25-- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26-- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27-- SUCH DAMAGE.
28--
1--
2-- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
3--
4-- Copyright (c) 2015 Pedro Souza <pedrosouza@freebsd.org>
5-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
6-- All rights reserved.
7--
8-- Redistribution and use in source and binary forms, with or without

--- 12 unchanged lines hidden (view full) ---

21-- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22-- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23-- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24-- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25-- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26-- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27-- SUCH DAMAGE.
28--
29-- $FreeBSD: stable/11/stand/lua/loader.lua 357191 2020-01-28 02:42:33Z kevans $
29-- $FreeBSD: stable/11/stand/lua/loader.lua 360599 2020-05-03 04:03:05Z kevans $
30--
31
32-- The cli module should be included first here. Some of the functions that it
33-- defines are necessary for the Lua-based loader to operate in general.
34-- Other modules will also need some of the functions it defines to safely
35-- execute loader commands.
36require("cli")
37local color = require("color")
38local core = require("core")
39local config = require("config")
40local password = require("password")
30--
31
32-- The cli module should be included first here. Some of the functions that it
33-- defines are necessary for the Lua-based loader to operate in general.
34-- Other modules will also need some of the functions it defines to safely
35-- execute loader commands.
36require("cli")
37local color = require("color")
38local core = require("core")
39local config = require("config")
40local password = require("password")
41-- The menu module will be brought in after config has loaded if we actually
42-- need it.
43local menu
44
45config.load()
46
41
42config.load()
43
47-- Our console may have been setup for a different color scheme before we get
48-- here, so make sure we set the default.
44if core.isUEFIBoot() then
45 loader.perform("efi-autoresizecons")
46end
47-- Our console may have been setup with different settings before we get
48-- here, so make sure we reset everything back to default.
49if color.isEnabled() then
49if color.isEnabled() then
50 printc(color.default())
50 printc(core.KEYSTR_RESET)
51end
52try_include("local")
51end
52try_include("local")
53if not core.isMenuSkipped() then
54 menu = require("menu")
55end
56password.check()
53password.check()
57-- menu might be disabled
58if menu ~= nil then
59 menu.run()
54if not core.isMenuSkipped() then
55 require("menu").run()
60else
61 -- Load kernel/modules before we go
62 config.loadelf()
63end
56else
57 -- Load kernel/modules before we go
58 config.loadelf()
59end