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