grub2/0206-Fix-the-efidir-in-grub-setpassword.patch
Javier Martinez Canillas dc178ac546 Two more fixes for BLS support
- Use version field to sort BLS entries if id field isn't defined
 - Add version field to BLS fragments generated by 20-grub.install

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2018-05-11 10:13:07 -04:00

28 lines
896 B
Diff

From c7c6cb4380f5bd85a2cbe747433657fdce89a802 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Thu, 15 Mar 2018 14:12:54 -0400
Subject: [PATCH 206/238] Fix the efidir in grub-setpassword
Signed-off-by: Peter Jones <pjones@redhat.com>
---
util/grub-setpassword.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
index d7924af5192..cf70257eed6 100644
--- a/util/grub-setpassword.in
+++ b/util/grub-setpassword.in
@@ -1,7 +1,8 @@
#!/bin/sh -e
+EFIDIR=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')
if [ -d /sys/firmware/efi/efivars/ ]; then
- grubdir=`echo "/@bootdirname@/efi/EFI/redhat/" | sed 's,//*,/,g'`
+ grubdir=`echo "/@bootdirname@/efi/EFI/${EFIDIR}/" | sed 's,//*,/,g'`
else
grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`
fi
--
2.17.0