dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0196-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch

8631a2
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
8631a2
From: Hans de Goede <hdegoede@redhat.com>
8631a2
Date: Fri, 29 Jun 2018 10:08:22 +0200
8631a2
Subject: [PATCH] 30_uefi-firmware: fix use with /sys/firmware/efi/efivars
8631a2
8631a2
Fix 30_uefi-firmware checking for the obsolete /sys/firmware/efi/vars
8631a2
instead of for the new efivarfs mounted at /sys/firmware/efi/efivars.
8631a2
8631a2
Which goes to show that I really should have tested this before blindly
8631a2
importing it from Ubuntu.
8631a2
8631a2
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
8631a2
---
8631a2
 util/grub.d/30_uefi-firmware.in | 6 +++---
8631a2
 1 file changed, 3 insertions(+), 3 deletions(-)
8631a2
8631a2
diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
8631a2
index 3c9f533d8c6..93ececffea7 100644
8631a2
--- a/util/grub.d/30_uefi-firmware.in
8631a2
+++ b/util/grub.d/30_uefi-firmware.in
8631a2
@@ -26,12 +26,12 @@ export TEXTDOMAINDIR="@localedir@"
8631a2
 
8631a2
 . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
8631a2
 
8631a2
-efi_vars_dir=/sys/firmware/efi/vars
8631a2
+efi_vars_dir=/sys/firmware/efi/efivars
8631a2
 EFI_GLOBAL_VARIABLE=8be4df61-93ca-11d2-aa0d-00e098032b8c
8631a2
-OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE/data"
8631a2
+OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE"
8631a2
 
8631a2
 if [ -e "$OsIndications" ] && \
8631a2
-   [ "$(( $(printf 0x%x \'"$(cat $OsIndications | cut -b1)") & 1 ))" = 1 ]; then
8631a2
+   [ "$(( $(printf 0x%x \'"$(cat $OsIndications | cut -b5)") & 1 ))" = 1 ]; then
8631a2
   LABEL="System setup"
8631a2
 
8631a2
   gettext_printf "Adding boot menu entry for EFI firmware configuration\n" >&2