From 91f9e5a07ca760b6b3f95932c84bbaccb73478b1 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javierm@redhat.com>
Date: Mon, 25 Jun 2018 13:08:09 +0200
Subject: [PATCH] Use /boot/loader/entries as BLS dir also on EFI systems

For EFI systems, the BLS fragments were stored in the EFI System Partition
(ESP) while in non-EFI systems it was stored in /boot.

For consistency, it's better to always store the BLS fragments in the same
path regardless of the firmware interface used.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
---
 20-grub.install | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/20-grub.install b/20-grub.install
index a6959c5..eda11d8 100755
--- a/20-grub.install
+++ b/20-grub.install
@@ -19,12 +19,7 @@ MACHINE_ID=$KERNEL_INSTALL_MACHINE_ID
 # Remove it, since for grub2 the images are always installed in /boot
 rm -rf "${BOOT_DIR_ABS%/*}"
 
-EFIDIR="$(echo "${ID}" | sed -e 's/rhel/redhat/')"
-
 BLS_DIR="/boot/loader/entries"
-if [ -d /sys/firmware/efi ]; then
-    BLS_DIR="/boot/efi/EFI/${EFIDIR}/loader/entries"
-fi
 
 mkbls() {
     local kernelver=$1 && shift