From ce4c8db35472c9589cbb83f55346c4117362b656 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Wed, 16 Oct 2019 12:34:21 +0200 Subject: [PATCH] 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 --- ...ix-typo-for-gfxpayload-variable-name.patch | 28 +++++++++++++++++++ grub.patches | 1 + grub2.spec | 8 +++++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0189-blscfg-Fix-typo-for-gfxpayload-variable-name.patch diff --git a/0189-blscfg-Fix-typo-for-gfxpayload-variable-name.patch b/0189-blscfg-Fix-typo-for-gfxpayload-variable-name.patch new file mode 100644 index 0000000..5599fa1 --- /dev/null +++ b/0189-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 +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 +--- + 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", diff --git a/grub.patches b/grub.patches index 27c9539..c5a3b8d 100644 --- a/grub.patches +++ b/grub.patches @@ -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 diff --git a/grub2.spec b/grub2.spec index 27dd9dd..ca2b4d2 100644 --- a/grub2.spec +++ b/grub2.spec @@ -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 - 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 - 2.02-100 - 99-grub-mkconfig: Fix script condition to exit and remove ppc64 BE check Related: rhbz#1703700