From 53711828a3bcf9a83f85b06b93c62d09d3046a13 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Mon, 20 May 2019 18:34:12 +0200 Subject: [PATCH] Don't try to switch to a BLS config if GRUB_ENABLE_BLSCFG is already set There's no point on executing the script if GRUB_ENABLE_BLSCFG has already been set. Currently was checking if an user explicitly set it to false to avoid enabling the BLS configuration, but it should also be avoided if was already set to true by a previous package update or during installation. Signed-off-by: Javier Martinez Canillas --- grub2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/grub2.spec b/grub2.spec index 1fea982..bcb3637 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 80%{?dist} +Release: 81%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -279,7 +279,7 @@ fi %posttrans tools if [ -f /etc/default/grub ]; then - ! grep -q '^GRUB_ENABLE_BLSCFG=false' /etc/default/grub && \ + ! grep -q '^GRUB_ENABLE_BLSCFG=.*' /etc/default/grub && \ /sbin/grub2-switch-to-blscfg --backup-suffix=.rpmsave &>/dev/null || : fi @@ -476,6 +476,9 @@ rm -r /boot/grub2.tmp/ || : %endif %changelog +* Mon May 20 2019 Javier Martinez Canillas - 2.02-81 +- Don't try to switch to a BLS config if GRUB_ENABLE_BLSCFG is already set + * Wed May 15 2019 Javier Martinez Canillas - 2.02-80 - Fix error messages wrongly being printed when executing blscfg command Resolves: rhbz#1699761