Author: kevans
Date: Sun Oct 7 15:28:50 2018
New Revision: 339222
URL: https://svnweb.freebsd.org/changeset/base/339222
Log:
lualoader: Honor boot_* variables at lua init
For non-UEFI systems, boot.config(5) may have -s or -v specified for
single-user and verbose boot respectively. These were not being properly
taken into account and reflected in the "Boot Options" submenu. When we
initialize core.lua, we'll record boot_single and boot_verbose as we do ACPI
and consider these the system defaults.
Reported by: David Wolfskill <da...@catwhisker.org>
Approved by: re (kib)
Modified:
head/stand/lua/core.lua
Modified: head/stand/lua/core.lua
==============================================================================
--- head/stand/lua/core.lua Sun Oct 7 15:13:47 2018 (r339221)
+++ head/stand/lua/core.lua Sun Oct 7 15:28:50 2018 (r339222)
@@ -34,6 +34,10 @@ local hook = require("hook")
local core = {}
+local default_safe_mode = false
+local default_single_user = false
+local default_verbose = false
+
local function composeLoaderCmd(cmd_name, argstr)
if argstr ~= nil then
cmd_name = cmd_name .. " " .. argstr
@@ -41,6 +45,26 @@ local function composeLoaderCmd(cmd_name, argstr)
return cmd_name
end
+local function recordDefaults()
+ -- On i386, hint.acpi.0.rsdp will be set before we're loaded. On !i386,
+ -- it will generally be set upon execution of the kernel. Because of
+ -- this, we can't (or don't really want to) detect/disable ACPI on !i386
+ -- reliably. Just set it enabled if we detect it and leave well enough
+ -- alone if we don't.
+ local boot_acpi = core.isSystem386() and core.getACPIPresent(false)
+ local boot_single = loader.getenv("boot_single") or "no"
+ local boot_verbose = loader.getenv("boot_verbose") or "no"
+ default_single_user = boot_single:lower() ~= "no"
+ default_verbose = boot_verbose:lower() ~= "no"
+
+ if boot_acpi then
+ core.setACPI(true)
+ end
+ core.setSingleUser(default_single_user)
+ core.setVerbose(default_verbose)
+end
+
+
-- Globals
-- try_include will return the loaded module on success, or nil on failure.
-- A message will also be printed on failure, with one exception: non-verbose
@@ -268,9 +292,9 @@ end
function core.setDefaults()
core.setACPI(core.getACPIPresent(true))
- core.setSafeMode(false)
- core.setSingleUser(false)
- core.setVerbose(false)
+ core.setSafeMode(default_safe_mode)
+ core.setSingleUser(default_single_user)
+ core.setVerbose(default_verbose)
end
function core.autoboot(argstr)
@@ -367,13 +391,6 @@ function core.popFrontTable(tbl)
return first_value, new_tbl
end
--- On i386, hint.acpi.0.rsdp will be set before we're loaded. On !i386, it will
--- generally be set upon execution of the kernel. Because of this, we can't (or
--- don't really want to) detect/disable ACPI on !i386 reliably. Just set it
--- enabled if we detect it and leave well enough alone if we don't.
-if core.isSystem386() and core.getACPIPresent(false) then
- core.setACPI(true)
-end
-
+recordDefaults()
hook.register("config.reloaded", core.clearCachedKernels)
return core
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
