Re-arm GRUB_ENABLE_BLSCFG=false

Resolves: #2018331
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Robbie Harwood 2022-02-18 21:21:20 +00:00
parent bfdc50ae19
commit d08fc02f2d
2 changed files with 10 additions and 3 deletions

View File

@ -40,14 +40,17 @@ if [[ $DISABLE_BLS = "true" ]]; then
fi fi
fi fi
[ -f /etc/default/grub ] && . /etc/default/grub
if [ x$GRUB_ENABLE_BLSCFG = xfalse ]; then
RUN_MKCONFIG=true
fi
# A traditional grub configuration file needs to be generated only in the case when # 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. # the bootloaders are not capable of populating a menu entry from the BLS fragments.
if [[ $RUN_MKCONFIG != "true" ]]; then if [[ $RUN_MKCONFIG != "true" ]]; then
exit 0 exit 0
fi fi
[[ -f /etc/default/grub ]] && . /etc/default/grub
COMMAND="$1" COMMAND="$1"
case "$COMMAND" in case "$COMMAND" in

View File

@ -14,7 +14,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 22%{?dist} Release: 23%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -530,6 +530,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif %endif
%changelog %changelog
* Fri Feb 18 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-23
- Re-arm GRUB_ENABLE_BLSCFG=false
- Resolves: #2018331
* Fri Feb 18 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-22 * Fri Feb 18 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-22
- Stop building unsupported 32-bit UEFI stuff - Stop building unsupported 32-bit UEFI stuff
- Resolves: #2038401 - Resolves: #2038401