rpms/grubby
5
0
Fork 0
Code Issues Pull Requests Releases Activity

grubby-bls: don't update grubenv when generating grub.cfg for ppc64le

Browse Source 
Since PowerNV machines can have a Petitboot versions that still don't have
BLS support, grubby re-generates the grub.cfg file on all ppc64le machines.

But this has the side effect that the grubenv file is updated, which will
overwrite any value that was set by grubby itself. To prevent that run the
grub2-mkconfig with the --no-grubenv-update option.

Related: rhbz#1726514

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
This commit is contained in:
Javier Martinez Canillas 2019-11-29 23:56:07 +01:00
parent 3ffa2d2706
commit b5070e2278
No known key found for this signature in database
GPG Key ID: C751E590D63F3D69
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grubby-bls
View File

@ -572,7 +572,7 @@ remove_var_prefix() {
update_grubcfg() update_grubcfg()
{ {
if [[ $arch = 'ppc64' || $arch = 'ppc64le' ]]; then if [[ $arch = 'ppc64' || $arch = 'ppc64le' ]]; then
grub2-mkconfig -o "${grub_config}" >& /dev/null grub2-mkconfig --no-grubenv-update -o "${grub_config}" >& /dev/null
fi fi
} }

6
grubby.spec
View File

@ -1,6 +1,6 @@
Name: grubby Name: grubby
Version: 8.40 Version: 8.40
Release: 37%{?dist} Release: 38%{?dist}
Summary: Command line tool for updating bootloader configs Summary: Command line tool for updating bootloader configs
License: GPLv2+ License: GPLv2+
URL: https://github.com/rhinstaller/grubby URL: https://github.com/rhinstaller/grubby
@ -131,6 +131,10 @@ current boot environment.
%{_mandir}/man8/*.8* %{_mandir}/man8/*.8*
%changelog %changelog
* Fri Nov 29 2019 Javier Martinez Canillas <javierm@redhat.com> - 8.40-38
- grubby-bls: don't update grubenv when generating grub.cfg for ppc64le
Related: rhbz#1726514
* Thu Nov 28 2019 Javier Martinez Canillas <javierm@redhat.com> - 8.40-37 * Thu Nov 28 2019 Javier Martinez Canillas <javierm@redhat.com> - 8.40-37
- grubby-bls: don't print rpm-sort error messages - grubby-bls: don't print rpm-sort error messages
Resolves: rhbz#1731924 Resolves: rhbz#1731924