From 8213073fa48bef1927dcac4acee7945b30bd62d6 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Mon, 11 Mar 2019 11:05:27 +0100 Subject: [PATCH] Only switch to BLS config for s390x / zipl For platforms using GRUB, the switch to BLS should be done in the %post scriptlet for the grub2-tools package. So only switch to BLS for s390x. Related: rhbz#1652806 Signed-off-by: Javier Martinez Canillas --- grubby.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/grubby.spec b/grubby.spec index 9df01e6..b4965c8 100644 --- a/grubby.spec +++ b/grubby.spec @@ -1,6 +1,6 @@ Name: grubby Version: 8.40 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Command line tool for updating bootloader configs License: GPLv2+ URL: https://github.com/rhinstaller/grubby @@ -84,13 +84,8 @@ sed -e "s,@@LIBEXECDIR@@,%{_libexecdir}/installkernel,g" %{SOURCE3} \ %post if [ "$1" = 2 ]; then arch=$(uname -m) - if [[ $arch == "s390x" ]]; then - command=zipl-switch-to-blscfg - else - command=grub2-switch-to-blscfg - fi - - $command --backup-suffix=.rpmsave &>/dev/null || : + [[ $arch == "s390x" ]] && \ + zipl-switch-to-blscfg --backup-suffix=.rpmsave &>/dev/null || : fi %package deprecated @@ -132,6 +127,10 @@ current boot environment. %{_mandir}/man8/*.8* %changelog +* Mon Mar 11 2019 Javier Martinez Canillas - 8.40-29 +- Only switch to BLS config for s390x / zipl + Related: rhbz#1652806 + * Fri Mar 01 2019 Javier Martinez Canillas - 8.40-28 - grubby-bls: make --update-kernel ALL to update kernelopts var in grubenv