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>

0295-blscfg-Fix-typo-for-gfxpayload-variable-name.patch

@@ -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",

grub.patches

@@ -292,3 +292,4 @@ Patch0291: 0291-Add-10_reset_boot_success-to-Makefile.patch
 Patch0292: 0292-blscfg-remove-BLS-file-size-check.patch
 Patch0293: 0293-Remove-bogus-load_env-after-blscfg-command-in-10_lin.patch
 Patch0294: 0294-blscfg-Don-t-leave-grub_errno-set-to-an-error-if-the.patch
+Patch0295: 0295-blscfg-Fix-typo-for-gfxpayload-variable-name.patch

grub2.spec

@@ -7,7 +7,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.02
-Release:	83%{?dist}
+Release:	84%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -476,6 +476,12 @@ rm -r /boot/grub2.tmp/ || :
 %endif
 
 %changelog
+* Wed Oct 16 2019 Javier Martinez Canillas <javierm@redhat.com> - 2.02-84
+- 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-83
 - 99-grub-mkconfig: Fix script condition to exit and remove ppc64 BE check
   Related: rhbz#1703700