dcavalca / rpms / grub2

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