From 37f094c099cb7c145cc843a24b3b5ae0e5189c40 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Wed, 20 Mar 2019 17:15:00 +0100 Subject: [PATCH] grubby-bls: fix --add-kernel not working when using the --args option The script prints an error if --args option is used without --update-kernel but it's also valid to use it with the --add-kernel option. Resolves: rhbz#1691004 Signed-off-by: Javier Martinez Canillas --- grubby-bls | 2 +- grubby.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/grubby-bls b/grubby-bls index d4a543e..3551896 100755 --- a/grubby-bls +++ b/grubby-bls @@ -734,7 +734,7 @@ while [ ${#} -gt 0 ]; do shift done -if [[ -z $update_kernel ]] && [[ -n $args || -n $remove_args ]]; then +if [[ -z $update_kernel && -z $kernel ]] && [[ -n $args || -n $remove_args ]]; then print_error "no action specified" fi diff --git a/grubby.spec b/grubby.spec index b4965c8..711c7bc 100644 --- a/grubby.spec +++ b/grubby.spec @@ -1,6 +1,6 @@ Name: grubby Version: 8.40 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Command line tool for updating bootloader configs License: GPLv2+ URL: https://github.com/rhinstaller/grubby @@ -127,6 +127,10 @@ current boot environment. %{_mandir}/man8/*.8* %changelog +* Thu Mar 21 2019 Javier Martinez Canillas - 8.40-30 +- grubby-bls: fix --add-kernel not working when using the --args option + Resolves: rhbz#1691004 + * Mon Mar 11 2019 Javier Martinez Canillas - 8.40-29 - Only switch to BLS config for s390x / zipl Related: rhbz#1652806