A couple of BLS fixes

99-grub-mkconfig: Also disable BLS usage for Xen Dom0 hosts
  Resolves: rhbz#1761799
blscfg: Fix typo for gfxpayload variable name
  Resolves: rhbz#1706489

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
This commit is contained in:
Javier Martinez Canillas 2019-10-16 12:34:21 +02:00
parent 68d521ff85
commit ce4c8db354
No known key found for this signature in database
GPG key ID: C751E590D63F3D69
3 changed files with 36 additions and 1 deletions

View file

@ -0,0 +1,28 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javierm@redhat.com>
Date: Wed, 16 Oct 2019 12:16:32 +0200
Subject: [PATCH] blscfg: Fix typo for gfxpayload variable name
There was a silly typo when setting the environment variable gfxpayload so
graphics mode wouldn't be preserved on some machines leading to text mode.
Resolves: rhbz#1706489
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
---
grub-core/commands/blscfg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
index 26dbe873fe4..8c6dd91be10 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -822,7 +822,7 @@ static void create_entry (struct bls_entry *entry)
}
src = grub_xasprintf ("load_video\n"
- "set gfx_payload=keep\n"
+ "set gfxpayload=keep\n"
"insmod gzio\n"
"linux %s%s%s%s\n"
"%s",

View file

@ -186,3 +186,4 @@ Patch0185: 0185-arm-Align-section-alignment-with-manual-relocation-o.patch
Patch0186: 0186-grub-core-loader-efi-fdt.c-Do-not-copy-random-memory.patch
Patch0187: 0187-linux-efi-arm-fdt-break-FDT-extra-allocation-space-o.patch
Patch0188: 0188-Don-t-add-a-class-option-to-menu-entries-generated-f.patch
Patch0189: 0189-blscfg-Fix-typo-for-gfxpayload-variable-name.patch

View file

@ -7,7 +7,7 @@
Name: grub2
Epoch: 1
Version: 2.02
Release: 100%{?dist}
Release: 101%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+
URL: http://www.gnu.org/software/grub/
@ -518,6 +518,12 @@ rm -r /boot/grub2.tmp/ || :
%endif
%changelog
* Wed Oct 16 2019 Javier Martinez Canillas <javierm@redhat.com> - 2.02-101
- 99-grub-mkconfig: Also disable BLS usage for Xen Dom0 hosts
Resolves: rhbz#1761799
- blscfg: Fix typo for gfxpayload variable name
Resolves: rhbz#1706489
* Thu Oct 10 2019 Javier Martinez Canillas <javierm@redhat.com> - 2.02-100
- 99-grub-mkconfig: Fix script condition to exit and remove ppc64 BE check
Related: rhbz#1703700