rpms/grub2
6
0
Fork 0
Code Issues Pull Requests Releases Activity

99-grub-mkconfig.install: fix condition allowing correct checks if GRUB_ENABLE_BLSCFG is not present

Browse Source 
Resolves: #RHEL-80168

Signed-off-by: Leo Sandoval <lsandova@redhat.com>
This commit is contained in:
Leo Sandoval 2025-04-24 10:49:54 -06:00
parent d8b3b9c701
commit 85c3021108
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
99-grub-mkconfig.install
View File

@ -8,9 +8,19 @@ ARCH=$(uname -m)
[[ -f /etc/default/grub ]] && . /etc/default/grub [[ -f /etc/default/grub ]] && . /etc/default/grub
# Can't assume a BLS capable bootloader on ppc64 # Assume GRUB_ENABLE_BLSCFG is true if
if [[ x$GRUB_ENABLE_BLSCFG = xtrue && # GRUB_ENABLE_BLSCFG is not set, e.g. /etc/default/grub does not exist
$ARCH != "ppc64" && $ARCH != "ppc64le" ]]; then # GRUB_ENABLE_BLSCFG is set to true
if [[ x$GRUB_ENABLE_BLSCFG != xfalse ]]; then
# Can't assume a BLS capable bootloader on ppc64
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 exit 0
fi fi

6
grub2.spec
View File

@ -7,7 +7,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.02 Version: 2.02
Release: 166%{?dist} Release: 167%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base Group: System Environment/Base
License: GPLv3+ License: GPLv3+
@ -526,6 +526,10 @@ fi
%endif %endif
%changelog %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 * 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 - Don't try to switch to a BLS config if GRUB_ENABLE_BLSCFG is already set
- Resolves: #RHEL-86913 - Resolves: #RHEL-86913