grubby-bls: error if args or remove-args is used without update-kernel

The --args and --remove-args options can only be used when the kernel to
update is specified using the --update-kernel option. Print an error if
the latter option is not provided.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
This commit is contained in:
Javier Martinez Canillas 2019-02-14 10:33:36 +01:00
parent ac9b25b31e
commit 40d73389b4
No known key found for this signature in database
GPG Key ID: C751E590D63F3D69
2 changed files with 8 additions and 1 deletions

View File

@ -706,6 +706,10 @@ while [ ${#} -gt 0 ]; do
shift
done
if [[ -z $update_kernel ]] && [[ -n $args || -n $remove_args ]]; then
print_error "no action specified"
fi
if [[ -z $blsdir ]]; then
blsdir="/boot/loader/entries"
fi

View File

@ -1,6 +1,6 @@
Name: grubby
Version: 8.40
Release: 26%{?dist}
Release: 27%{?dist}
Summary: Command line tool for updating bootloader configs
License: GPLv2+
URL: https://github.com/rhinstaller/grubby
@ -132,6 +132,9 @@ current boot environment.
%{_mandir}/man8/*.8*
%changelog
* Thu Feb 14 2019 Javier Martinez Canillas <javierm@redhat.com> - 8.40-27
- grubby-bls: error if args or remove-args is used without update-kernel
* Tue Feb 05 2019 Javier Martinez Canillas <javierm@redhat.com> - 8.40-26
- Fix GCC warnings about possible string truncations and buffer overflows
- grubby-bls: unset default entry if is the one being removed