Notification time stamped 2019-11-30 16:32:10 UTC
From b5070e227834b2cfeb531a111972770c703ead23 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javierm(a)redhat.com>
Date: Nov 29 2019 23:29:12 +0000
Subject: grubby-bls: don't update grubenv when generating grub.cfg for ppc64le
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(a)redhat.com>
---
diff --git a/grubby-bls b/grubby-bls
index 06a021b..2c6cb3d 100755
--- a/grubby-bls
+++ b/grubby-bls
@@ -572,7 +572,7 @@ remove_var_prefix() {
update_grubcfg()
{
if [[ $arch = 'ppc64' || $arch = 'ppc64le' ]]; then
- grub2-mkconfig -o "${grub_config}" >& /dev/null
+ grub2-mkconfig --no-grubenv-update -o "${grub_config}" >& /dev/null
fi
}
diff --git a/grubby.spec b/grubby.spec
index b87c1bc..acb69a0 100644
--- a/grubby.spec
+++ b/grubby.spec
@@ -1,6 +1,6 @@
Name: grubby
Version: 8.40
-Release: 37%{?dist}
+Release: 38%{?dist}
Summary: Command line tool for updating bootloader configs
License: GPLv2+
URL:
https://github.com/rhinstaller/grubby
@@ -131,6 +131,10 @@ current boot environment.
%{_mandir}/man8/*.8*
%changelog
+* Fri Nov 29 2019 Javier Martinez Canillas <javierm(a)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(a)redhat.com> - 8.40-37
- grubby-bls: don't print rpm-sort error messages
Resolves: rhbz#1731924
https://src.fedoraproject.org/rpms/grubby/c/b5070e227834b2cfeb531a1119727...