diff options
| author | Colin Watson <cjwatson@ubuntu.com> | 2013-11-28 02:27:13 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@ubuntu.com> | 2013-11-28 02:29:15 +0000 |
| commit | 8f236c141916cc149e325fd8ebeab725568bf907 (patch) | |
| tree | f611747f4a2a0f866a1a5260316906bb29b0e1fe /util/grub-mkconfig.in | |
| parent | 2d76b4d81e7afc91c4d5d56c4f388e4a1e26b01d (diff) | |
Revamp hidden timeout handling
Add a new timeout_style environment variable and a corresponding
GRUB_TIMEOUT_STYLE configuration key for grub-mkconfig. This
controls hidden-timeout handling more simply than the previous
arrangements, and pressing any hotkeys associated with menu entries
during the hidden timeout will now boot the corresponding menu entry
immediately.
GRUB_HIDDEN_TIMEOUT=<non-empty> + GRUB_TIMEOUT=<non-zero> now
generates a warning, and if it shows the menu it will do so as if
the second timeout were not present. Other combinations are
translated into reasonable equivalents.
Diffstat (limited to 'util/grub-mkconfig.in')
| -rw-r--r-- | util/grub-mkconfig.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in index ba1d4ef35..50f73aae5 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -186,6 +186,7 @@ export GRUB_DEFAULT \ GRUB_HIDDEN_TIMEOUT \ GRUB_HIDDEN_TIMEOUT_QUIET \ GRUB_TIMEOUT \ + GRUB_TIMEOUT_STYLE \ GRUB_DEFAULT_BUTTON \ GRUB_HIDDEN_TIMEOUT_BUTTON \ GRUB_TIMEOUT_BUTTON \ |