From dc354eb1d9bde64f5530608a0711d0f5de0c11ac Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Fri, 25 Aug 2023 13:31:05 +0200 Subject: [PATCH] Don't run 20-grub.install for UKIs When kernel-install is called for a UKI, 20-grub.install copies it to /boot which is totally unneeded, UKIs are now handled by the standard systemd's 90-uki-copy.install (systemd-253+) correctly which places them to the ESP. Resolves: #RHEL-21368 Signed-off-by: Vitaly Kuznetsov Signed-off-by: Nicolas Frayer --- 20-grub.install | 3 +++ grub2.spec | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/20-grub.install b/20-grub.install index fe7ad8a5..a3f1b18b 100755 --- a/20-grub.install +++ b/20-grub.install @@ -19,6 +19,9 @@ MACHINE_ID=$KERNEL_INSTALL_MACHINE_ID # If ${BOOT_DIR_ABS} exists, some other boot loader is active. [[ -d "${BOOT_DIR_ABS}" ]] && exit 0 +# UKIs are BLS type 2 entries, 90-uki-copy.install takes care of them +[ "x$KERNEL_INSTALL_LAYOUT" != "xuki" ] || exit 0 + BLS_DIR="/boot/loader/entries" mkbls() { diff --git a/grub2.spec b/grub2.spec index 6846136e..e4029c30 100644 --- a/grub2.spec +++ b/grub2.spec @@ -16,7 +16,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 73%{?dist} +Release: 74%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -533,6 +533,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Mon Feb 5 2024 Nicolas Frayer - 2.06-74 +- Don't run 20-grub.install for UKIs +- Resolves: #RHEL-21368 + * Thu Jan 4 2024 Nicolas Frayer - 2.06-73 - search command: add flag to only search root dev - Resolves: #RHEL-20526