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