Import from CS git

SOURCES/99-grub-mkconfig.install

@@ -8,9 +8,19 @@ ARCH=$(uname -m)
 
 [[ -f /etc/default/grub ]] && . /etc/default/grub
 
+# Assume GRUB_ENABLE_BLSCFG is true if
+# GRUB_ENABLE_BLSCFG is not set, e.g. /etc/default/grub does not exist
+# GRUB_ENABLE_BLSCFG is set to true
+if [[ x$GRUB_ENABLE_BLSCFG != xfalse ]]; then
     # Can't assume a BLS capable bootloader on ppc64
-if [[ x$GRUB_ENABLE_BLSCFG = xtrue &&
-	  $ARCH != "ppc64" && $ARCH != "ppc64le" ]]; then
+    if [[  $ARCH = "ppc64" || $ARCH = "ppc64le" ]]; then
+	RUN_MKCONFIG="true"
+    fi
+fi
+
+# A traditional grub configuration file needs to be generated only in the case when
+# the bootloaders are not capable of populating a menu entry from the BLS fragments.
+if [[ $RUN_MKCONFIG != "true" ]]; then
     exit 0
 fi
 

SPECS/grub2.spec

@@ -7,7 +7,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.02
-Release:	165%{?dist}
+Release:	167%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 Group:		System Environment/Base
 License:	GPLv3+
@@ -307,8 +307,11 @@ if [ "$1" = 1 ]; then
 fi
 
 if [ "$1" = 2 ]; then
+    if [ -f /etc/default/grub ]; then
+	! grep -q '^GRUB_ENABLE_BLSCFG=.*' /etc/default/grub && \
 	    /sbin/grub2-switch-to-blscfg --backup-suffix=.rpmsave &>/dev/null || :
     fi
+fi
 
 %posttrans common
 set -eu
@@ -523,6 +526,14 @@ fi
 %endif
 
 %changelog
+* Thu Apr 24 2025 Leo Sandoval <lsandova@redhat.com> - 2.02-167
+- 99-grub-mkconfig.install: fix condition allowing correct checks if GRUB_ENABLE_BLSCFG is not present
+- Resolves: #RHEL-80168
+
+* Wed Apr 23 2025 Leo Sandoval <lsandova@redhat.com> - 2.02-166
+- Don't try to switch to a BLS config if GRUB_ENABLE_BLSCFG is already set
+- Resolves: #RHEL-86913
+
 * Thu Apr 17 2025 Nicolas Frayer <nfrayer@redhat.com> - 2.02-165
 - fs/ext2: Rework of OOB read patch
 - Resolves: #RHEL-86553