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>
This commit is contained in:
Javier Martinez Canillas 2018-06-25 13:08:09 +02:00 committed by Peter Jones
parent db5dccf332
commit 91f9e5a07c

View File

@ -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