gummiboot: WaitForKeyEx hanging workaround (see systemd/systemd#3735)

This commit is contained in:
Kye Shi 2020-12-09 16:03:36 -08:00 committed by Érico Nogueira Rolim
parent e285453b7d
commit 88286dc4b2
2 changed files with 23 additions and 1 deletions

View file

@ -0,0 +1,22 @@
This patch fixes an issue where pressing any key within the gummiboot
menu causes it to hang (though no issue occurs if no key is pressed). The
culprit appears to be the WaitForKeyEx function, which lacks support in certain
UEFI implementations. This fix is backported from the same issue found in
systemd-boot (gummiboot's mainstream counterpart): see
<https://github.com/systemd/systemd/issues/3632> and
<https://github.com/systemd/systemd/pull/3735>.
--- src/efi/console.c 2015-03-11 16:50:35.000000000 -0700
+++ src/efi/console.c 2020-12-09 15:41:19.837704801 -0800
@@ -96,10 +96,7 @@
/* wait until key is pressed */
if (wait) {
- if (TextInputEx)
- uefi_call_wrapper(BS->WaitForEvent, 3, 1, &TextInputEx->WaitForKeyEx, &index);
- else
- uefi_call_wrapper(BS->WaitForEvent, 3, 1, &ST->ConIn->WaitForKey, &index);
+ uefi_call_wrapper(BS->WaitForEvent, 3, 1, &ST->ConIn->WaitForKey, &index);
}
if (TextInputEx) {

View file

@ -1,7 +1,7 @@
# Template file for 'gummiboot' # Template file for 'gummiboot'
pkgname=gummiboot pkgname=gummiboot
version=48.1 version=48.1
revision=6 revision=7
archs="i686* x86_64* aarch64*" archs="i686* x86_64* aarch64*"
build_style=gnu-configure build_style=gnu-configure
conf_files="/etc/default/gummiboot" conf_files="/etc/default/gummiboot"