From 038570df6f74eff74ebe4bad49a8490ce19958dc Mon Sep 17 00:00:00 2001 From: Nicolas Frayer Date: Thu, 27 Jun 2024 14:57:23 +0200 Subject: [PATCH] mkconfig/install: Remove BLS handling for XEN Resolves: #RHEL-4386 Signed-off-by: Nicolas Frayer --- 99-grub-mkconfig.install | 8 -------- grub2.spec | 6 +++++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/99-grub-mkconfig.install b/99-grub-mkconfig.install index 2c7faad..b463082 100755 --- a/99-grub-mkconfig.install +++ b/99-grub-mkconfig.install @@ -4,14 +4,6 @@ if ! [[ $KERNEL_INSTALL_MACHINE_ID ]]; then exit 0 fi -# PV and PVH Xen DomU guests boot with pygrub that doesn't have BLS support, -# also Xen Dom0 use the menuentries from 20_linux_xen and not the ones from -# 10_linux. So BLS support needs to be disabled for both Xen Dom0 and DomU. -if [[ -e /sys/hypervisor/type ]] && grep -q "^xen$" /sys/hypervisor/type; then - RUN_MKCONFIG=true - DISABLE_BLS=true -fi - ARCH=$(uname -m) # Older ppc64le OPAL firmware (petitboot version < 1.8.0) don't have BLS support # so grub2-mkconfig has to be run to generate a config with menuentry commands. diff --git a/grub2.spec b/grub2.spec index cfdca79..a879b71 100644 --- a/grub2.spec +++ b/grub2.spec @@ -16,7 +16,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 81%{?dist} +Release: 82%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -537,6 +537,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Thu Jun 27 2024 Nicolas Frayer - 2.06-82 +- mkconfig/install: Remove BLS handling for XEN +- Resolves: #RHEL-4386 + * Tue Jun 25 2024 Marta Lewandowska - 2.06-81 - grub.cfg: Fix an issue when doing a major version upgrade - Resolves: #RHEL-45008