mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-19 02:05:42 +00:00
1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Fri, 29 Jun 2018 10:08:22 +0200
|
|
Subject: [PATCH] 30_uefi-firmware: fix use with /sys/firmware/efi/efivars
|
|
|
|
Fix 30_uefi-firmware checking for the obsolete /sys/firmware/efi/vars
|
|
instead of for the new efivarfs mounted at /sys/firmware/efi/efivars.
|
|
|
|
Which goes to show that I really should have tested this before blindly
|
|
importing it from Ubuntu.
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
---
|
|
util/grub.d/30_uefi-firmware.in | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
|
|
index 3c9f533d8c6..93ececffea7 100644
|
|
--- a/util/grub.d/30_uefi-firmware.in
|
|
+++ b/util/grub.d/30_uefi-firmware.in
|
|
@@ -26,12 +26,12 @@ export TEXTDOMAINDIR="@localedir@"
|
|
|
|
. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
|
|
|
|
-efi_vars_dir=/sys/firmware/efi/vars
|
|
+efi_vars_dir=/sys/firmware/efi/efivars
|
|
EFI_GLOBAL_VARIABLE=8be4df61-93ca-11d2-aa0d-00e098032b8c
|
|
-OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE/data"
|
|
+OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE"
|
|
|
|
if [ -e "$OsIndications" ] && \
|
|
- [ "$(( $(printf 0x%x \'"$(cat $OsIndications | cut -b1)") & 1 ))" = 1 ]; then
|
|
+ [ "$(( $(printf 0x%x \'"$(cat $OsIndications | cut -b5)") & 1 ))" = 1 ]; then
|
|
LABEL="System setup"
|
|
|
|
gettext_printf "Adding boot menu entry for EFI firmware configuration\n" >&2
|