mirror of
https://github.com/edera-dev/sprout.git
synced 2026-11-04 19:52:22 +00:00
fix(boot): load loader.conf before one-shot variables and normalize the boot count path
This commit is contained in:
1 parent
2c18f229c0
commit
7d913b3ab4
3 files changed
+45
-11
No files matched your search
@@ -295,8 +295,13 @@ impl BootloaderInterface {
|
||||
|
||||
// Attempt to acquire the value of the LoaderConfigTimeout variable.
|
||||
// The specification says that a value of 0 means that the menu should be hidden.
|
||||
// A failure to read it is only a warning, as the one-shot variable is already consumed.
|
||||
let direct = Self::get_timeout_value("LoaderConfigTimeout", false)
|
||||
.context("unable to check for LoaderConfigTimeout variable")?
|
||||
.context("unable to check for LoaderConfigTimeout variable")
|
||||
.unwrap_or_else(|error| {
|
||||
warn!("{:#}", error);
|
||||
None
|
||||
})
|
||||
.map(|direct| match direct {
|
||||
BootloaderInterfaceTimeout::Timeout(0) => BootloaderInterfaceTimeout::MenuHidden,
|
||||
other => other,
|
||||
|
||||
Reference in new issue
Block a user