vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

kern/term: Accept ESC, F4 and holding SHIFT as user interrupt keys

Browse source 
On some devices the ESC key is the hotkey to enter the BIOS/EFI setup
screen, making it really hard to time pressing it right. Besides that
ESC is also pretty hard to discover for a user who does not know it
will unhide the menu.

This commit makes F4, which was chosen because is not used as a hotkey
to enter the BIOS setup by any vendor, also interrupt sleeps / stop the
menu countdown.

This solves the ESC gets into the BIOS setup and also somewhat solves
the discoverability issue, but leaves the timing issue unresolved.

This commit fixes the timing issue by also adding support for keeping
SHIFT pressed during boot to stop the menu countdown. This matches
what Ubuntu is doing, which should also help with discoverability.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Hans de Goede 2020-04-15 12:26:22 +02:00 • committed by Daniel Kiper
parent 2d7c3abd87
commit 12341958d2
5 changed files with 41 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
grub-core/commands/sleep.c
View file

@ -55,7 +55,7 @@ grub_interruptible_millisleep (grub_uint32_t ms)
start = grub_get_time_ms ();
while (grub_get_time_ms () - start < ms)
if (grub_getkey_noblock () == GRUB_TERM_ESC)
if (grub_key_is_interrupt (grub_getkey_noblock ()))
return 1;
return 0;