.gitignore

@@ -1,9 +1,4 @@
-SOURCES/grub-2.02.tar.xz
-SOURCES/redhatsecureboot301.cer
-SOURCES/redhatsecureboot502.cer
-SOURCES/redhatsecureboot601.cer
-SOURCES/redhatsecureboot701.cer
-SOURCES/redhatsecurebootca3.cer
-SOURCES/redhatsecurebootca5.cer
+SOURCES/gnulib-fixes.tar.gz
+SOURCES/grub-2.06.tar.xz
 SOURCES/theme.tar.bz2
-SOURCES/unifont-5.1.20080820.pcf.gz
+SOURCES/unifont-13.0.06.pcf.gz

.grub2.metadata

@@ -1,9 +1,4 @@
-3d7eb6eaab28b88cb969ba9ab24af959f4d1b178 SOURCES/grub-2.02.tar.xz
-4a07b56e28741884b86da6ac91f8f9929541a1e4 SOURCES/redhatsecureboot301.cer
-3f94c47f1d08bacc7cb29bdd912e286b8d2f6fcf SOURCES/redhatsecureboot502.cer
-039357ef97aab3e484d1119edd4528156f5859e6 SOURCES/redhatsecureboot601.cer
-e89890ca0ded2f9058651cc5fa838b78db2e6cc2 SOURCES/redhatsecureboot701.cer
-cf9230e69000076727e5b784ec871d22716dc5da SOURCES/redhatsecurebootca3.cer
-e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer
+1a07692dfaa916675a92b1383885141f490f98d2 SOURCES/gnulib-fixes.tar.gz
+c9f93f1e195ec7a5a21d36a13b469788c0b29f0f SOURCES/grub-2.06.tar.xz
 cf0b7763c528902da7e8b05cfa248f20c8825ce5 SOURCES/theme.tar.bz2
-87f8600ba24e521b5d20bdf6c4b71af8ae861e3a SOURCES/unifont-5.1.20080820.pcf.gz
+3b39cb0830367171760ec536cab805abdbe08bc5 SOURCES/unifont-13.0.06.pcf.gz

SOURCES/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch

@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas <javierm@redhat.com>
+Date: Fri, 11 Jun 2021 12:10:45 +0200
+Subject: [PATCH] Revert "templates: Fix user-facing typo with an incorrect use
+ of "it's""
+
+This reverts commit 722737630889607c3b5761f1f5a48f1674cd2821.
+---
+ util/grub.d/30_os-prober.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
+index 5984e92d291..94622481284 100644
+--- a/util/grub.d/30_os-prober.in
++++ b/util/grub.d/30_os-prober.in
+@@ -36,7 +36,7 @@ if ! command -v os-prober > /dev/null || ! command -v linux-boot-prober > /dev/n
+   exit 0
+ fi
+ 
+-grub_warn "$(gettext_printf "os-prober will be executed to detect other bootable partitions.\nIts output will be used to detect bootable binaries on them and create new boot entries.")"
++grub_warn "$(gettext_printf "os-prober will be executed to detect other bootable partitions.\nIt's output will be used to detect bootable binaries on them and create new boot entries.")"
+ 
+ OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`"
+ if [ -z "${OSPROBED}" ] ; then

SOURCES/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch

@@ -0,0 +1,71 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas <javierm@redhat.com>
+Date: Fri, 11 Jun 2021 12:10:54 +0200
+Subject: [PATCH] Revert "templates: Properly disable the os-prober by default"
+
+This reverts commit 54e0a1bbf1e9106901a557195bb35e5e20fb3925.
+---
+ util/grub-mkconfig.in       | 5 +----
+ util/grub.d/30_os-prober.in | 8 ++++----
+ 2 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index f8cbb8d7a2b..d3e879b8e5c 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -140,9 +140,6 @@ GRUB_DEVICE_PARTUUID="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2
+ GRUB_DEVICE_BOOT="`${grub_probe} --target=device /boot`"
+ GRUB_DEVICE_BOOT_UUID="`${grub_probe} --device ${GRUB_DEVICE_BOOT} --target=fs_uuid 2> /dev/null`" || true
+ 
+-# Disable os-prober by default due to security reasons.
+-GRUB_DISABLE_OS_PROBER="true"
+-
+ # Filesystem for the device containing our userland.  Used for stuff like
+ # choosing Hurd filesystem module.
+ GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`"
+@@ -204,7 +201,6 @@ export GRUB_DEVICE \
+   GRUB_DEVICE_PARTUUID \
+   GRUB_DEVICE_BOOT \
+   GRUB_DEVICE_BOOT_UUID \
+-  GRUB_DISABLE_OS_PROBER \
+   GRUB_FS \
+   GRUB_FONT \
+   GRUB_PRELOAD_MODULES \
+@@ -246,6 +242,7 @@ export GRUB_DEFAULT \
+   GRUB_BACKGROUND \
+   GRUB_THEME \
+   GRUB_GFXPAYLOAD_LINUX \
++  GRUB_DISABLE_OS_PROBER \
+   GRUB_INIT_TUNE \
+   GRUB_SAVEDEFAULT \
+   GRUB_ENABLE_CRYPTODISK \
+diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
+index 94622481284..80685b15f4d 100644
+--- a/util/grub.d/30_os-prober.in
++++ b/util/grub.d/30_os-prober.in
+@@ -26,8 +26,8 @@ export TEXTDOMAINDIR="@localedir@"
+ 
+ . "$pkgdatadir/grub-mkconfig_lib"
+ 
+-if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
+-  grub_warn "$(gettext_printf "os-prober will not be executed to detect other bootable partitions.\nSystems on them will not be added to the GRUB boot configuration.\nCheck GRUB_DISABLE_OS_PROBER documentation entry.")"
++if [ "x${GRUB_DISABLE_OS_PROBER}" = "xfalse" ]; then
++  gettext_printf "os-prober will not be executed to detect other bootable partitions.\nSystems on them will not be added to the GRUB boot configuration.\nCheck GRUB_DISABLE_OS_PROBER documentation entry.\n"
+   exit 0
+ fi
+ 
+@@ -36,12 +36,12 @@ if ! command -v os-prober > /dev/null || ! command -v linux-boot-prober > /dev/n
+   exit 0
+ fi
+ 
+-grub_warn "$(gettext_printf "os-prober will be executed to detect other bootable partitions.\nIt's output will be used to detect bootable binaries on them and create new boot entries.")"
+-
+ OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`"
+ if [ -z "${OSPROBED}" ] ; then
+   # empty os-prober output, nothing doing
+   exit 0
++else
++  grub_warn "$(gettext_printf "os-prober was executed to detect other bootable partitions.\nIt's output will be used to detect bootable binaries on them and create new boot entries.")"
+ fi
+ 
+ osx_entry() {

SOURCES/0003-Revert-templates-Disable-the-os-prober-by-default.patch

@@ -0,0 +1,70 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas <javierm@redhat.com>
+Date: Fri, 11 Jun 2021 12:10:58 +0200
+Subject: [PATCH] Revert "templates: Disable the os-prober by default"
+
+This reverts commit e346414725a70e5c74ee87ca14e580c66f517666.
+---
+ docs/grub.texi              | 18 ++++++++----------
+ util/grub.d/30_os-prober.in |  5 +----
+ 2 files changed, 9 insertions(+), 14 deletions(-)
+
+diff --git a/docs/grub.texi b/docs/grub.texi
+index f8b4b3b21a7..69f08d289f9 100644
+--- a/docs/grub.texi
++++ b/docs/grub.texi
+@@ -1519,13 +1519,10 @@ boot sequence.  If you have problems, set this option to @samp{text} and
+ GRUB will tell Linux to boot in normal text mode.
+ 
+ @item GRUB_DISABLE_OS_PROBER
+-The @command{grub-mkconfig} has a feature to use the external
+-@command{os-prober} program to discover other operating systems installed on
+-the same machine and generate appropriate menu entries for them. It is disabled
+-by default since automatic and silent execution of @command{os-prober}, and
+-creating boot entries based on that data, is a potential attack vector. Set
+-this option to @samp{false} to enable this feature in the
+-@command{grub-mkconfig} command.
++Normally, @command{grub-mkconfig} will try to use the external
++@command{os-prober} program, if installed, to discover other operating
++systems installed on the same system and generate appropriate menu entries
++for them.  Set this option to @samp{true} to disable this.
+ 
+ @item GRUB_OS_PROBER_SKIP_LIST
+ List of space-separated FS UUIDs of filesystems to be ignored from os-prober
+@@ -1853,9 +1850,10 @@ than zero; otherwise 0.
+ @section Multi-boot manual config
+ 
+ Currently autogenerating config files for multi-boot environments depends on
+-os-prober and has several shortcomings. Due to that it is disabled by default.
+-It is advised to use the power of GRUB syntax and do it yourself. A possible
+-configuration is detailed here, feel free to adjust to your needs.
++os-prober and has several shortcomings. While fixing it is scheduled for the
++next release, meanwhile you can make use of the power of GRUB syntax and do it
++yourself. A possible configuration is detailed here, feel free to adjust to your
++needs.
+ 
+ First create a separate GRUB partition, big enough to hold GRUB. Some of the
+ following entries show how to load OS installer images from this same partition,
+diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
+index 80685b15f4d..1b91c102f35 100644
+--- a/util/grub.d/30_os-prober.in
++++ b/util/grub.d/30_os-prober.in
+@@ -26,8 +26,7 @@ export TEXTDOMAINDIR="@localedir@"
+ 
+ . "$pkgdatadir/grub-mkconfig_lib"
+ 
+-if [ "x${GRUB_DISABLE_OS_PROBER}" = "xfalse" ]; then
+-  gettext_printf "os-prober will not be executed to detect other bootable partitions.\nSystems on them will not be added to the GRUB boot configuration.\nCheck GRUB_DISABLE_OS_PROBER documentation entry.\n"
++if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
+   exit 0
+ fi
+ 
+@@ -40,8 +39,6 @@ OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`"
+ if [ -z "${OSPROBED}" ] ; then
+   # empty os-prober output, nothing doing
+   exit 0
+-else
+-  grub_warn "$(gettext_printf "os-prober was executed to detect other bootable partitions.\nIt's output will be used to detect bootable binaries on them and create new boot entries.")"
+ fi
+ 
+ osx_entry() {

SOURCES/0004-Add-support-for-Linux-EFI-stub-loading.patch

@@ -35,20 +35,19 @@ moves the check into grub_dl_load_file.
  grub-core/loader/i386/efi/linux.c | 335 ++++++++++++++++++++++++++++++++++++++
  grub-core/loader/i386/pc/linux.c  |  10 +-
  include/grub/arm/linux.h          |   9 +
- include/grub/arm64/linux.h        |  10 ++
+ include/grub/arm64/linux.h        |   9 +
  include/grub/efi/efi.h            |   7 +-
  include/grub/efi/linux.h          |  31 ++++
- include/grub/i386/linux.h         |   1 +
- 14 files changed, 620 insertions(+), 69 deletions(-)
+ 13 files changed, 618 insertions(+), 69 deletions(-)
  create mode 100644 grub-core/loader/efi/linux.c
  create mode 100644 grub-core/loader/i386/efi/linux.c
  create mode 100644 include/grub/efi/linux.h
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 9590e87d9..0b4b0c212 100644
+index 8022e1c0a79..45d3edaa4dc 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -1626,13 +1626,6 @@ module = {
+@@ -1734,13 +1734,6 @@ module = {
    enable = i386_pc;
  };
  
@@ -62,7 +61,7 @@ index 9590e87d9..0b4b0c212 100644
  module = {
    name = ntldr;
    i386_pc = loader/i386/pc/ntldr.c;
-@@ -1685,7 +1678,9 @@ module = {
+@@ -1796,7 +1789,9 @@ module = {
  
  module = {
    name = linux;
@@ -70,13 +69,13 @@ index 9590e87d9..0b4b0c212 100644
 +  i386_pc = loader/i386/pc/linux.c;
 +  x86_64_efi = loader/i386/efi/linux.c;
 +  i386_efi = loader/i386/efi/linux.c;
+   i386_xen_pvh = loader/i386/linux.c;
    xen = loader/i386/xen.c;
    i386_pc = lib/i386/pc/vesa_modes_table.c;
-   mips = loader/mips/linux.c;
-@@ -1696,9 +1691,14 @@ module = {
-   arm_efi = loader/arm64/linux.c;
-   arm_uboot = loader/arm/linux.c;
+@@ -1811,9 +1806,14 @@ module = {
    arm64 = loader/arm64/linux.c;
+   riscv32 = loader/riscv/linux.c;
+   riscv64 = loader/riscv/linux.c;
 +  emu = loader/emu/linux.c;
 +  fdt = lib/fdt.c;
 +
@@ -89,7 +88,7 @@ index 9590e87d9..0b4b0c212 100644
  
  module = {
 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index e394cd96f..04e804d16 100644
+index 48f8a79073d..b7149370950 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
 @@ -38,6 +38,14 @@
@@ -107,7 +106,7 @@ index e394cd96f..04e804d16 100644
  
  
  #pragma GCC diagnostic ignored "-Wcast-align"
-@@ -686,6 +694,19 @@ grub_dl_load_file (const char *filename)
+@@ -695,6 +703,19 @@ grub_dl_load_file (const char *filename)
    void *core = 0;
    grub_dl_t mod = 0;
  
@@ -126,13 +125,13 @@ index e394cd96f..04e804d16 100644
 +
    grub_boot_time ("Loading module %s", filename);
  
-   file = grub_file_open (filename);
+   file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE);
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 708581fcb..c8a9d8307 100644
+index 8cff7be0289..35b8f670602 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -273,6 +273,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
-   return NULL;
+@@ -286,6 +286,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
+   return grub_efi_get_variable_with_attributes (var, guid, datasize_out, data_out, NULL);
  }
  
 +grub_efi_boolean_t
@@ -167,7 +166,7 @@ index 708581fcb..c8a9d8307 100644
  
  /* Search the mods section from the PE32/PE32+ image. This code uses
 diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index 42ad7c570..5cdf6c943 100644
+index 9838fb2f50d..f6aef0ef649 100644
 --- a/grub-core/kern/efi/mm.c
 +++ b/grub-core/kern/efi/mm.c
 @@ -113,6 +113,38 @@ grub_efi_drop_alloc (grub_efi_physical_address_t address,
@@ -210,7 +209,7 @@ index 42ad7c570..5cdf6c943 100644
  void *
  grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 1f86229f8..6c00af98d 100644
+index ef3e9f9444c..a312c668685 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
 @@ -29,6 +29,7 @@
@@ -221,7 +220,7 @@ index 1f86229f8..6c00af98d 100644
  #include <grub/efi/pe32.h>
  #include <grub/i18n.h>
  #include <grub/lib/cmdline.h>
-@@ -40,6 +41,7 @@ static int loaded;
+@@ -41,6 +42,7 @@ static int loaded;
  
  static void *kernel_addr;
  static grub_uint64_t kernel_size;
@@ -229,7 +228,7 @@ index 1f86229f8..6c00af98d 100644
  
  static char *linux_args;
  static grub_uint32_t cmdline_size;
-@@ -66,7 +68,8 @@ grub_armxx_efi_linux_check_image (struct linux_armxx_kernel_header * lh)
+@@ -67,7 +69,8 @@ grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
  static grub_err_t
  finalize_params_linux (void)
  {
@@ -239,7 +238,7 @@ index 1f86229f8..6c00af98d 100644
  
    void *fdt;
  
-@@ -101,79 +104,70 @@ finalize_params_linux (void)
+@@ -102,79 +105,70 @@ finalize_params_linux (void)
    if (grub_fdt_install() != GRUB_ERR_NONE)
      goto failure;
  
@@ -251,7 +250,7 @@ index 1f86229f8..6c00af98d 100644
 -}
 -
 -grub_err_t
--grub_armxx_efi_linux_boot_image (grub_addr_t addr, grub_size_t size, char *args)
+-grub_arch_efi_linux_boot_image (grub_addr_t addr, grub_size_t size, char *args)
 -{
 -  grub_efi_memory_mapped_device_path_t *mempath;
 -  grub_efi_handle_t image_handle;
@@ -284,7 +283,7 @@ index 1f86229f8..6c00af98d 100644
 -
 -  grub_dprintf ("linux", "linux command line: '%s'\n", args);
 +  grub_dprintf ("linux", "Installed/updated FDT configuration table @ %p\n",
-+		fdt);
++                fdt);
  
    /* Convert command line to UCS-2 */
 -  loaded_image = grub_efi_get_loaded_image (image_handle);
@@ -304,7 +303,7 @@ index 1f86229f8..6c00af98d 100644
    loaded_image->load_options_size =
      2 * grub_utf8_to_utf16 (loaded_image->load_options, len,
 -			    (grub_uint8_t *) args, len, NULL);
-+			    (grub_uint8_t *) linux_args, len, NULL);
++                           (grub_uint8_t *) linux_args, len, NULL);
  
 -  grub_dprintf ("linux", "starting image %p\n", image_handle);
 -  status = b->start_image (image_handle, 0, NULL);
@@ -329,15 +328,15 @@ index 1f86229f8..6c00af98d 100644
 +  if (loaded_image)
 +    {
 +      if (loaded_image->load_options)
-+	grub_efi_free_pages ((grub_efi_physical_address_t)(grub_efi_uintn_t)loaded_image->load_options,
-+			     GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
++       grub_efi_free_pages ((grub_efi_physical_address_t)(grub_efi_uintn_t)loaded_image->load_options,
++                            GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
 +      loaded_image->load_options = NULL;
 +      loaded_image->load_options_size = 0;
 +    }
 +}
 +
 +grub_err_t
-+grub_armxx_efi_linux_boot_image (grub_addr_t addr, char *args)
++grub_arch_efi_linux_boot_image (grub_addr_t addr, char *args)
 +{
 +  grub_err_t retval;
 +
@@ -360,21 +359,21 @@ index 1f86229f8..6c00af98d 100644
 -  if (finalize_params_linux () != GRUB_ERR_NONE)
 -    return grub_errno;
 -
--  return (grub_armxx_efi_linux_boot_image((grub_addr_t)kernel_addr,
+-  return (grub_arch_efi_linux_boot_image((grub_addr_t)kernel_addr,
 -                                          kernel_size, linux_args));
-+  return grub_armxx_efi_linux_boot_image((grub_addr_t)kernel_addr, linux_args);
++  return (grub_arch_efi_linux_boot_image((grub_addr_t)kernel_addr, linux_args));
  }
  
  static grub_err_t
-@@ -287,6 +281,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -288,6 +282,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  {
    grub_file_t file = 0;
-   struct linux_armxx_kernel_header lh;
+   struct linux_arch_kernel_header lh;
 +  struct grub_armxx_linux_pe_header *pe;
+   grub_err_t err;
  
    grub_dl_ref (my_mod);
- 
-@@ -331,6 +326,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -333,6 +328,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
    grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
  
@@ -391,20 +390,20 @@ index 1f86229f8..6c00af98d 100644
    linux_args = grub_malloc (cmdline_size);
    if (!linux_args)
 diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
-index 1003a0b99..f35b16caa 100644
+index 22cc25eccd9..d9b7a9ba400 100644
 --- a/grub-core/loader/arm64/xen_boot.c
 +++ b/grub-core/loader/arm64/xen_boot.c
 @@ -266,7 +266,6 @@ xen_boot (void)
      return err;
  
-   return grub_armxx_efi_linux_boot_image (xen_hypervisor->start,
+   return grub_arch_efi_linux_boot_image (xen_hypervisor->start,
 -					  xen_hypervisor->size,
  					  xen_hypervisor->cmdline);
  }
  
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
 new file mode 100644
-index 000000000..c24202a5d
+index 00000000000..c24202a5dd1
 --- /dev/null
 +++ b/grub-core/loader/efi/linux.c
 @@ -0,0 +1,70 @@
@@ -480,7 +479,7 @@ index 000000000..c24202a5d
 +#pragma GCC diagnostic pop
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
 new file mode 100644
-index 000000000..3db82e782
+index 00000000000..bb2616a8092
 --- /dev/null
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -0,0 +1,335 @@
@@ -589,8 +588,7 @@ index 000000000..3db82e782
 +
 +  for (i = 0; i < argc; i++)
 +    {
-+      grub_file_filter_disable_compression ();
-+      files[i] = grub_file_open (argv[i]);
++      files[i] = grub_file_open (argv[i], GRUB_FILE_TYPE_LINUX_INITRD | GRUB_FILE_TYPE_NO_DECOMPRESS);
 +      if (! files[i])
 +        goto fail;
 +      nfiles++;
@@ -643,7 +641,7 @@ index 000000000..3db82e782
 +		int argc, char *argv[])
 +{
 +  grub_file_t file = 0;
-+  struct linux_kernel_header lh;
++  struct linux_i386_kernel_header lh;
 +  grub_ssize_t len, start, filelen;
 +  void *kernel = NULL;
 +
@@ -655,7 +653,7 @@ index 000000000..3db82e782
 +      goto fail;
 +    }
 +
-+  file = grub_file_open (argv[0]);
++  file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL);
 +  if (! file)
 +    goto fail;
 +
@@ -731,7 +729,8 @@ index 000000000..3db82e782
 +  grub_memcpy (linux_cmdline, LINUX_IMAGE, sizeof (LINUX_IMAGE));
 +  grub_create_loader_cmdline (argc, argv,
 +                              linux_cmdline + sizeof (LINUX_IMAGE) - 1,
-+			      lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1));
++			      lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1),
++			      GRUB_VERIFY_KERNEL_CMDLINE);
 +
 +  lh.cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
 +
@@ -820,10 +819,10 @@ index 000000000..3db82e782
 +  grub_unregister_command (cmd_initrdefi);
 +}
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index b69cb7a3a..a3c87cf2f 100644
+index 2a299520160..8be4c3b3f48 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
-@@ -468,14 +468,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+@@ -474,14 +474,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
    return grub_errno;
  }
  
@@ -845,7 +844,7 @@ index b69cb7a3a..a3c87cf2f 100644
      grub_register_command ("initrd16", grub_cmd_initrd,
  			   0, N_("Load initrd."));
    my_mod = mod;
-@@ -484,5 +490,7 @@ GRUB_MOD_INIT(linux16)
+@@ -490,5 +496,7 @@ GRUB_MOD_INIT(linux16)
  GRUB_MOD_FINI(linux16)
  {
    grub_unregister_command (cmd_linux);
@@ -854,7 +853,7 @@ index b69cb7a3a..a3c87cf2f 100644
 +  grub_unregister_command (cmd_initrd16);
  }
 diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
-index 712ba17b9..5900fc8a4 100644
+index bcd5a7eb186..b582f67f661 100644
 --- a/include/grub/arm/linux.h
 +++ b/include/grub/arm/linux.h
 @@ -20,6 +20,7 @@
@@ -878,25 +877,24 @@ index 712ba17b9..5900fc8a4 100644
 +
  #if defined(__arm__)
  # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM_MAGIC_SIGNATURE
- # define linux_armxx_kernel_header linux_arm_kernel_header
+ # define linux_arch_kernel_header linux_arm_kernel_header
 +# define grub_armxx_linux_pe_header grub_arm_linux_pe_header
  #endif
  
  #if defined GRUB_MACHINE_UBOOT
 diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
-index 8655067e0..7b533b571 100644
+index 7e22b4ab699..ea030312df3 100644
 --- a/include/grub/arm64/linux.h
 +++ b/include/grub/arm64/linux.h
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,7 @@
  #ifndef GRUB_ARM64_LINUX_HEADER
  #define GRUB_ARM64_LINUX_HEADER 1
  
 +#include <grub/efi/pe32.h>
-+
- #define GRUB_LINUX_ARM64_MAGIC_SIGNATURE 0x644d5241 /* 'ARM\x64' */
+ #include <grub/types.h>
  
- /* From linux/Documentation/arm64/booting.txt */
-@@ -36,9 +38,17 @@ struct linux_arm64_kernel_header
+ #define GRUB_LINUX_ARM64_MAGIC_SIGNATURE 0x644d5241 /* 'ARM\x64' */
+@@ -38,9 +39,17 @@ struct linux_arm64_kernel_header
    grub_uint32_t hdr_offset;	/* Offset of PE/COFF header */
  };
  
@@ -909,13 +907,13 @@ index 8655067e0..7b533b571 100644
 +
  #if defined(__aarch64__)
  # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM64_MAGIC_SIGNATURE
- # define linux_armxx_kernel_header linux_arm64_kernel_header
+ # define linux_arch_kernel_header linux_arm64_kernel_header
 +# define grub_armxx_linux_pe_header grub_arm64_linux_pe_header
  #endif
  
  #endif /* ! GRUB_ARM64_LINUX_HEADER */
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 2c6648d46..1061aee97 100644
+index 83d958f9945..6295df85f3f 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
 @@ -47,6 +47,9 @@ EXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,
@@ -928,7 +926,7 @@ index 2c6648d46..1061aee97 100644
  void EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address,
  				       grub_efi_uintn_t pages);
  grub_efi_uintn_t EXPORT_FUNC(grub_efi_find_mmap_size) (void);
-@@ -82,6 +85,7 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
+@@ -88,6 +91,7 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
  				     const grub_efi_guid_t *guid,
  				     void *data,
  				     grub_size_t datasize);
@@ -936,19 +934,19 @@ index 2c6648d46..1061aee97 100644
  int
  EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,
  					     const grub_efi_device_path_t *dp2);
-@@ -95,8 +99,7 @@ void *EXPORT_FUNC(grub_efi_get_firmware_fdt)(void);
+@@ -101,8 +105,7 @@ void *EXPORT_FUNC(grub_efi_get_firmware_fdt)(void);
  grub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t *);
  #include <grub/cpu/linux.h>
- grub_err_t grub_armxx_efi_linux_check_image(struct linux_armxx_kernel_header *lh);
--grub_err_t grub_armxx_efi_linux_boot_image(grub_addr_t addr, grub_size_t size,
+ grub_err_t grub_arch_efi_linux_check_image(struct linux_arch_kernel_header *lh);
+-grub_err_t grub_arch_efi_linux_boot_image(grub_addr_t addr, grub_size_t size,
 -                                           char *args);
-+grub_err_t grub_armxx_efi_linux_boot_image(grub_addr_t addr, char *args);
++grub_err_t grub_arch_efi_linux_boot_image(grub_addr_t addr, char *args);
  #endif
  
  grub_addr_t grub_efi_modules_addr (void);
 diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
 new file mode 100644
-index 000000000..d9ede3677
+index 00000000000..d9ede36773b
 --- /dev/null
 +++ b/include/grub/efi/linux.h
 @@ -0,0 +1,31 @@
@@ -983,15 +981,3 @@ index 000000000..d9ede3677
 +				  void *kernel_param);
 +
 +#endif /* ! GRUB_EFI_LINUX_HEADER */
-diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
-index 60c7c3b5e..bb19dbd5a 100644
---- a/include/grub/i386/linux.h
-+++ b/include/grub/i386/linux.h
-@@ -142,6 +142,7 @@ struct linux_i386_kernel_header
-   grub_uint64_t setup_data;
-   grub_uint64_t pref_address;
-   grub_uint32_t init_size;
-+  grub_uint32_t handover_offset;
- } GRUB_PACKED;
- 
- /* Boot parameters for Linux based on 2.6.12. This is used by the setup

SOURCES/0005-Rework-linux-command.patch

@@ -6,15 +6,17 @@ Subject: [PATCH] Rework linux command
 We want a single buffer that contains the entire kernel image in order to
 perform a TPM measurement. Allocate one and copy the entire kernel into it
 before pulling out the individual blocks later on.
+
+Signed-off-by: Matthew Garrett <mjg59@coreos.com>
 ---
- grub-core/loader/i386/linux.c | 37 ++++++++++++++++++++++++-------------
- 1 file changed, 24 insertions(+), 13 deletions(-)
+ grub-core/loader/i386/linux.c | 35 +++++++++++++++++++++++------------
+ 1 file changed, 23 insertions(+), 12 deletions(-)
 
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 9b53d3168..f7186be40 100644
+index 9f74a96b19a..dccf3bb3005 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
-@@ -685,13 +685,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -649,13 +649,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  {
    grub_file_t file = 0;
    struct linux_i386_kernel_header lh;
@@ -31,7 +33,7 @@ index 9b53d3168..f7186be40 100644
  
    grub_dl_ref (my_mod);
  
-@@ -705,7 +707,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -669,7 +671,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    if (! file)
      goto fail;
  
@@ -48,7 +50,7 @@ index 9b53d3168..f7186be40 100644
      {
        if (!grub_errno)
  	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
-@@ -713,6 +723,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -677,6 +687,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -58,33 +60,25 @@ index 9b53d3168..f7186be40 100644
    if (lh.boot_flag != grub_cpu_to_le16_compile_time (0xaa55))
      {
        grub_error (GRUB_ERR_BAD_OS, "invalid magic number");
-@@ -804,6 +817,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
- 		      preferred_address))
-     goto fail;
+@@ -784,13 +797,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+   /* We've already read lh so there is no need to read it second time. */
+   len -= sizeof(lh);
  
-+
-   grub_memset (&linux_params, 0, sizeof (linux_params));
-   grub_memcpy (&linux_params.setup_sects, &lh.setup_sects, sizeof (lh) - 0x1F1);
- 
-@@ -812,13 +826,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-   linux_params.ps_mouse = linux_params.padding10 =  0;
- 
-   len = sizeof (linux_params) - sizeof (lh);
--  if (grub_file_read (file, (char *) &linux_params + sizeof (lh), len) != len)
--    {
+-  if ((len > 0) &&
+-      (grub_file_read (file, (char *) &linux_params + sizeof (lh), len) != len))
++  linux_params_ptr = (void *)&linux_params;
++  if (len > 0)
+     {
 -      if (!grub_errno)
 -	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
 -		    argv[0]);
 -      goto fail;
--    }
-+
-+  linux_params_ptr = (void *)&linux_params;
-+  grub_memcpy (linux_params_ptr + sizeof (lh), kernel + kernel_offset, len);
-+  kernel_offset += len;
++      grub_memcpy (linux_params_ptr + sizeof (lh), kernel + kernel_offset, len);
++      kernel_offset += len;
+     }
  
-   linux_params.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE;
- 
-@@ -877,7 +888,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+   linux_params.code32_start = prot_mode_target + lh.code32_start - GRUB_LINUX_BZIMAGE_ADDR;
+@@ -853,7 +864,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
    /* The other parameters are filled when booting.  */
  
@@ -93,8 +87,8 @@ index 9b53d3168..f7186be40 100644
  
    grub_dprintf ("linux", "bzImage, setup=0x%x, size=0x%x\n",
  		(unsigned) real_size, (unsigned) prot_size);
-@@ -1025,9 +1036,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
- 			      - (sizeof (LINUX_IMAGE) - 1));
+@@ -1007,9 +1018,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+   }
  
    len = prot_file_size;
 -  if (grub_file_read (file, prot_mode_mem, len) != len && !grub_errno)
@@ -104,7 +98,7 @@ index 9b53d3168..f7186be40 100644
  
    if (grub_errno == GRUB_ERR_NONE)
      {
-@@ -1038,6 +1047,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -1020,6 +1029,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
   fail:
  

SOURCES/0006-Rework-linux16-command.patch

@@ -6,15 +6,17 @@ Subject: [PATCH] Rework linux16 command
 We want a single buffer that contains the entire kernel image in order to
 perform a TPM measurement. Allocate one and copy the entire kernel int it
 before pulling out the individual blocks later on.
+
+Signed-off-by: Matthew Garrett <mjg59@coreos.com>
 ---
- grub-core/loader/i386/pc/linux.c | 34 +++++++++++++++++++++-------------
- 1 file changed, 21 insertions(+), 13 deletions(-)
+ grub-core/loader/i386/pc/linux.c | 33 +++++++++++++++++++++------------
+ 1 file changed, 21 insertions(+), 12 deletions(-)
 
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index a3c87cf2f..caa76bee8 100644
+index 8be4c3b3f48..4b1750e360e 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
-@@ -123,13 +123,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -124,13 +124,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    grub_file_t file = 0;
    struct linux_i386_kernel_header lh;
    grub_uint8_t setup_sects;
@@ -30,7 +32,7 @@ index a3c87cf2f..caa76bee8 100644
  
    grub_dl_ref (my_mod);
  
-@@ -143,7 +144,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -144,7 +145,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    if (! file)
      goto fail;
  
@@ -47,7 +49,7 @@ index a3c87cf2f..caa76bee8 100644
      {
        if (!grub_errno)
  	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
-@@ -151,6 +160,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -152,6 +161,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -57,7 +59,7 @@ index a3c87cf2f..caa76bee8 100644
    if (lh.boot_flag != grub_cpu_to_le16_compile_time (0xaa55))
      {
        grub_error (GRUB_ERR_BAD_OS, "invalid magic number");
-@@ -314,13 +326,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -320,13 +332,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    grub_memmove (grub_linux_real_chunk, &lh, sizeof (lh));
  
    len = real_size + GRUB_DISK_SECTOR_SIZE - sizeof (lh);
@@ -74,12 +76,11 @@ index a3c87cf2f..caa76bee8 100644
  
    if (lh.header != grub_cpu_to_le32_compile_time (GRUB_LINUX_I386_MAGIC_SIGNATURE)
        || grub_le_to_cpu16 (lh.version) < 0x0200)
-@@ -355,10 +363,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -364,9 +372,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    }
  
    len = grub_linux16_prot_size;
--  if (grub_file_read (file, grub_linux_prot_chunk, grub_linux16_prot_size)
--      != (grub_ssize_t) grub_linux16_prot_size && !grub_errno)
+-  if (grub_file_read (file, grub_linux_prot_chunk, len) != len && !grub_errno)
 -    grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
 -		argv[0]);
 +  grub_memcpy (grub_linux_prot_chunk, kernel + kernel_offset, len);
@@ -87,7 +88,7 @@ index a3c87cf2f..caa76bee8 100644
  
    if (grub_errno == GRUB_ERR_NONE)
      {
-@@ -368,6 +374,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -376,6 +383,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
   fail:
  

SOURCES/0007-Add-secureboot-support-on-efi-chainloader.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raymund Will <rw@suse.com>
-Date: Fri, 10 Apr 2015 01:45:02 -0400
+Date: Mon, 8 Jul 2019 11:55:18 +0200
 Subject: [PATCH] Add secureboot support on efi chainloader
 
 Expand the chainloader to be able to verify the image by means of shim
@@ -167,18 +167,18 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 ---
  grub-core/kern/efi/efi.c           |  14 +-
  grub-core/loader/arm64/linux.c     |   4 +-
- grub-core/loader/efi/chainloader.c | 817 +++++++++++++++++++++++++++++++++----
+ grub-core/loader/efi/chainloader.c | 816 +++++++++++++++++++++++++++++++++----
  grub-core/loader/efi/linux.c       |  25 +-
  grub-core/loader/i386/efi/linux.c  |  17 +-
  include/grub/efi/linux.h           |   2 +-
  include/grub/efi/pe32.h            |  52 ++-
- 7 files changed, 840 insertions(+), 91 deletions(-)
+ 7 files changed, 840 insertions(+), 90 deletions(-)
 
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index c8a9d8307..91129e335 100644
+index 35b8f670602..4a2259aa1c7 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -283,14 +283,20 @@ grub_efi_secure_boot (void)
+@@ -296,14 +296,20 @@ grub_efi_secure_boot (void)
    grub_efi_boolean_t ret = 0;
  
    secure_boot = grub_efi_get_variable("SecureBoot", &efi_var_guid, &datasize);
@@ -204,18 +204,18 @@ index c8a9d8307..91129e335 100644
    if (*secure_boot && !*setup_mode)
      ret = 1;
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 6c00af98d..a1ac7a388 100644
+index a312c668685..04994d5c67d 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
-@@ -282,6 +282,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-   grub_file_t file = 0;
-   struct linux_armxx_kernel_header lh;
+@@ -284,6 +284,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+   struct linux_arch_kernel_header lh;
    struct grub_armxx_linux_pe_header *pe;
+   grub_err_t err;
 +  int rc;
  
    grub_dl_ref (my_mod);
  
-@@ -326,7 +327,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -328,7 +329,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
    grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
  
@@ -226,7 +226,7 @@ index 6c00af98d..a1ac7a388 100644
        grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]);
        goto fail;
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index adc856366..af2189619 100644
+index 2bd80f4db3d..b54cf6986fc 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -32,6 +32,8 @@
@@ -261,15 +261,7 @@ index adc856366..af2189619 100644
  
    grub_dl_unref (my_mod);
    return GRUB_ERR_NONE;
-@@ -173,7 +181,6 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
-   /* Fill the file path for the directory.  */
-   d = (grub_efi_device_path_t *) ((char *) file_path
- 				  + ((char *) d - (char *) dp));
--  grub_efi_print_device_path (d);
-   copy_file_path ((grub_efi_file_path_device_path_t *) d,
- 		  dir_start, dir_end - dir_start);
- 
-@@ -191,20 +198,690 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
+@@ -213,20 +221,690 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
    return file_path;
  }
  
@@ -963,7 +955,7 @@ index adc856366..af2189619 100644
  
    if (argc == 0)
      return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-@@ -216,15 +893,45 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -238,15 +916,45 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    address = 0;
    image_handle = 0;
    file_path = 0;
@@ -997,7 +989,7 @@ index adc856366..af2189619 100644
 +      *(--p16) = 0;
 +    }
 +
-   file = grub_file_open (filename);
+   file = grub_file_open (filename, GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE);
    if (! file)
      goto fail;
  
@@ -1011,7 +1003,7 @@ index adc856366..af2189619 100644
    if (! dev)
      goto fail;
  
-@@ -261,17 +968,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -283,17 +991,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    if (! file_path)
      goto fail;
  
@@ -1032,7 +1024,7 @@ index adc856366..af2189619 100644
  
    status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_ANY_PAGES,
  			      GRUB_EFI_LOADER_CODE,
-@@ -285,7 +989,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -307,7 +1012,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
      }
  
    boot_image = (void *) ((grub_addr_t) address);
@@ -1041,7 +1033,7 @@ index adc856366..af2189619 100644
      {
        if (grub_errno == GRUB_ERR_NONE)
  	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
-@@ -295,7 +999,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -317,7 +1022,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
      }
  
  #if defined (__i386__) || defined (__x86_64__)
@@ -1050,12 +1042,12 @@ index adc856366..af2189619 100644
      {
        struct grub_macho_fat_header *head = boot_image;
        if (head->magic
-@@ -304,6 +1008,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -326,6 +1031,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
  	  grub_uint32_t i;
  	  struct grub_macho_fat_arch *archs
  	    = (struct grub_macho_fat_arch *) (head + 1);
 +
-+	  if (grub_efi_secure_boot())
++	  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +	    {
 +	      grub_error (GRUB_ERR_BAD_OS,
 +			  "MACHO binaries are forbidden with Secure Boot");
@@ -1065,7 +1057,7 @@ index adc856366..af2189619 100644
  	  for (i = 0; i < grub_cpu_to_le32 (head->nfat_arch); i++)
  	    {
  	      if (GRUB_MACHO_CPUTYPE_IS_HOST_CURRENT (archs[i].cputype))
-@@ -318,79 +1030,39 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -340,79 +1053,39 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
  	      > ~grub_cpu_to_le32 (archs[i].size)
  	      || grub_cpu_to_le32 (archs[i].offset)
  	      + grub_cpu_to_le32 (archs[i].size)
@@ -1162,7 +1154,7 @@ index adc856366..af2189619 100644
    if (dev)
      grub_device_close (dev);
  
-@@ -402,6 +1074,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -424,6 +1097,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    if (address)
      efi_call_2 (b->free_pages, address, pages);
  
@@ -1173,7 +1165,7 @@ index adc856366..af2189619 100644
  
    return grub_errno;
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index c24202a5d..c8ecce6df 100644
+index c24202a5dd1..c8ecce6dfd0 100644
 --- a/grub-core/loader/efi/linux.c
 +++ b/grub-core/loader/efi/linux.c
 @@ -33,21 +33,34 @@ struct grub_efi_shim_lock
@@ -1218,10 +1210,10 @@ index c24202a5d..c8ecce6df 100644
  
  #pragma GCC diagnostic push
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 3db82e782..8db228c5b 100644
+index bb2616a8092..6b24cbb9483 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
-@@ -118,6 +118,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+@@ -117,6 +117,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -1230,15 +1222,15 @@ index 3db82e782..8db228c5b 100644
    params->ramdisk_size = size;
    params->ramdisk_image = (grub_uint32_t)(grub_addr_t) initrd_mem;
  
-@@ -160,6 +162,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-   struct linux_kernel_header lh;
+@@ -159,6 +161,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+   struct linux_i386_kernel_header lh;
    grub_ssize_t len, start, filelen;
    void *kernel = NULL;
 +  int rc;
  
    grub_dl_ref (my_mod);
  
-@@ -185,11 +188,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -184,11 +187,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
    if (grub_file_read (file, kernel, filelen) != filelen)
      {
@@ -1254,7 +1246,7 @@ index 3db82e782..8db228c5b 100644
      {
        grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"),
  		  argv[0]);
-@@ -204,6 +209,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -203,6 +208,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -1263,7 +1255,7 @@ index 3db82e782..8db228c5b 100644
    grub_memset (params, 0, 16384);
  
    grub_memcpy (&lh, kernel, sizeof (lh));
-@@ -242,6 +249,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -241,6 +248,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -1286,7 +1278,7 @@ index 3db82e782..8db228c5b 100644
      grub_file_close (file);
  
 diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
-index d9ede3677..0033d9305 100644
+index d9ede36773b..0033d9305a9 100644
 --- a/include/grub/efi/linux.h
 +++ b/include/grub/efi/linux.h
 @@ -22,7 +22,7 @@
@@ -1299,10 +1291,10 @@ index d9ede3677..0033d9305 100644
  grub_err_t
  EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset,
 diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
-index 7d44732d2..c03cc599f 100644
+index 0ed8781f037..a43adf27464 100644
 --- a/include/grub/efi/pe32.h
 +++ b/include/grub/efi/pe32.h
-@@ -214,7 +214,11 @@ struct grub_pe64_optional_header
+@@ -223,7 +223,11 @@ struct grub_pe64_optional_header
  struct grub_pe32_section_table
  {
    char name[8];
@@ -1315,7 +1307,7 @@ index 7d44732d2..c03cc599f 100644
    grub_uint32_t virtual_address;
    grub_uint32_t raw_data_size;
    grub_uint32_t raw_data_offset;
-@@ -225,12 +229,18 @@ struct grub_pe32_section_table
+@@ -234,12 +238,18 @@ struct grub_pe32_section_table
    grub_uint32_t characteristics;
  };
  
@@ -1338,7 +1330,7 @@ index 7d44732d2..c03cc599f 100644
  
  #define GRUB_PE32_SCN_ALIGN_1BYTES		0x00100000
  #define GRUB_PE32_SCN_ALIGN_2BYTES		0x00200000
-@@ -239,10 +249,28 @@ struct grub_pe32_section_table
+@@ -248,10 +258,28 @@ struct grub_pe32_section_table
  #define GRUB_PE32_SCN_ALIGN_16BYTES		0x00500000
  #define GRUB_PE32_SCN_ALIGN_32BYTES		0x00600000
  #define GRUB_PE32_SCN_ALIGN_64BYTES		0x00700000
@@ -1367,7 +1359,7 @@ index 7d44732d2..c03cc599f 100644
  #define GRUB_PE32_SIGNATURE_SIZE 4
  
  struct grub_pe32_header
-@@ -265,6 +293,20 @@ struct grub_pe32_header
+@@ -274,6 +302,20 @@ struct grub_pe32_header
  #endif
  };
  

SOURCES/0007-re-write-.gitignore.patch

@@ -1,502 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 8 Aug 2017 12:48:04 -0400
-Subject: [PATCH] re-write .gitignore
-
----
- .gitignore                        | 357 +++++++++++++-------------------------
- build-aux/.gitignore              |   9 +
- docs/.gitignore                   |   4 +
- grub-core/.gitignore              |  15 ++
- grub-core/gnulib/.gitignore       |  22 +++
- grub-core/lib/.gitignore          |   1 +
- include/grub/gcrypt/.gitignore    |   2 +
- po/.gitignore                     |   4 +
- util/bash-completion.d/.gitignore |   1 +
- 9 files changed, 175 insertions(+), 240 deletions(-)
- create mode 100644 build-aux/.gitignore
- create mode 100644 docs/.gitignore
- create mode 100644 grub-core/.gitignore
- create mode 100644 grub-core/gnulib/.gitignore
- create mode 100644 grub-core/lib/.gitignore
- create mode 100644 include/grub/gcrypt/.gitignore
- create mode 100644 po/.gitignore
- create mode 100644 util/bash-completion.d/.gitignore
-
-diff --git a/.gitignore b/.gitignore
-index eca17bec9..43f04d472 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -1,249 +1,126 @@
--00_header
--10_*
--20_linux_xen
--30_os-prober
--40_custom
--41_custom
--*.1
--*.8
--aclocal.m4
--ahci_test
--ascii.bitmaps
--ascii.h
--autom4te.cache
--build-grub-gen-asciih
--build-grub-gen-widthspec
--build-grub-mkfont
--cdboot_test
--cmp_test
--config.cache
--config.guess
--config.h
--config-util.h
--config-util.h.in
--config.log
--config.status
--config.sub
--configure
--core_compress_test
--DISTLIST
--docs/*.info
--docs/stamp-vti
--docs/version.texi
--ehci_test
--example_grub_script_test
--example_scripted_test
--example_unit_test
-+# things ./autogen.sh will create
-+/Makefile.utilgcry.def
-+/aclocal.m4
-+/autom4te.cache
-+/configure
-+Makefile
-+# we want to enable building in a subdirectory, but we don't want to exclude
-+# /build-aux so explicitly don't ignore it.
-+/build*/
-+!/build-aux/
-+
-+# things very common editors create that we never want
-+*~
-+.*.sw?
-+*.patch
-+
-+# built objects across the whole tree
-+Makefile.in
-+*.a
-+*.am
- *.exec
--*.exec.exe
--fddboot_test
--genkernsyms.sh
--gensymlist.sh
--gentrigtables
--gentrigtables.exe
--gettext_strings_test
--grub-bin2h
--/grub-bios-setup
--/grub-bios-setup.exe
--grub_cmd_date
--grub_cmd_echo
--grub_cmd_regexp
--grub_cmd_set_date
--grub_cmd_sleep
--/grub-editenv
--/grub-editenv.exe
--grub-emu
--grub-emu-lite
--grub-emu.exe
--grub-emu-lite.exe
--grub_emu_init.c
--grub_emu_init.h
--/grub-file
--/grub-file.exe
--grub-fstest
--grub-fstest.exe
--grub_fstest_init.c
--grub_fstest_init.h
--grub_func_test
--grub-install
--grub-install.exe
--grub-kbdcomp
--/grub-macbless
--/grub-macbless.exe
--grub-macho2img
--/grub-menulst2cfg
--/grub-menulst2cfg.exe
--/grub-mk*
--grub-mount
--/grub-ofpathname
--/grub-ofpathname.exe
--grub-core/build-grub-pe2elf.exe
--/grub-probe
--/grub-probe.exe
--grub_probe_init.c
--grub_probe_init.h
--/grub-reboot
--grub_script_blanklines
--grub_script_blockarg
--grub_script_break
--grub-script-check
--grub-script-check.exe
--grub_script_check_init.c
--grub_script_check_init.h
--grub_script_comments
--grub_script_continue
--grub_script_dollar
--grub_script_echo1
--grub_script_echo_keywords
--grub_script_escape_comma
--grub_script_eval
--grub_script_expansion
--grub_script_final_semicolon
--grub_script_for1
--grub_script_functions
--grub_script_gettext
--grub_script_if
--grub_script_leading_whitespace
--grub_script_no_commands
--grub_script_not
--grub_script_return
--grub_script_setparams
--grub_script_shift
--grub_script_strcmp
--grub_script_test
--grub_script_vars1
--grub_script_while1
--grub_script.tab.c
--grub_script.tab.h
--grub_script.yy.c
--grub_script.yy.h
--grub-set-default
--grub_setup_init.c
--grub_setup_init.h
--grub-shell
--grub-shell-tester
--grub-sparc64-setup
--grub-sparc64-setup.exe
--/grub-syslinux2cfg
--/grub-syslinux2cfg.exe
--gzcompress_test
--hddboot_test
--help_test
--*.img
- *.image
--*.image.exe
--include/grub/cpu
--include/grub/machine
--install-sh
--lib/libgcrypt-grub
--libgrub_a_init.c
--*.log
-+*.img
-+*.info
- *.lst
--lzocompress_test
- *.marker
--Makefile
- *.mod
--mod-*.c
--missing
--netboot_test
-+*.module
- *.o
--*.a
--ohci_test
--partmap_test
--pata_test
- *.pf2
--*.pp
--po/*.mo
--po/grub.pot
--po/POTFILES
--po/stamp-po
--printf_test
--priority_queue_unit_test
--pseries_test
--stamp-h
--stamp-h1
--stamp-h.in
--symlist.c
--symlist.h
--trigtables.c
--*.trs
--uhci_test
--update-grub_lib
--unidata.c
--xzcompress_test
--Makefile.in
--GPATH
--GRTAGS
--GSYMS
--GTAGS
--compile
--depcomp
--mdate-sh
--texinfo.tex
--grub-core/lib/libgcrypt-grub
--.deps
--.deps-util
--.deps-core
-+*.yy.[ch]
-+.deps/
-+.deps-core/
-+.deps-util/
- .dirstamp
--Makefile.util.am
--contrib
--grub-core/bootinfo.txt
--grub-core/Makefile.core.am
--grub-core/Makefile.gcry.def
--grub-core/contrib
--grub-core/gdb_grub
--grub-core/genmod.sh
--grub-core/gensyminfo.sh
--grub-core/gmodule.pl
--grub-core/grub.chrp
--grub-core/modinfo.sh
--grub-core/*.module
--grub-core/*.module.exe
--grub-core/*.pp
--grub-core/kernel.img.bin
--util/bash-completion.d/grub
--grub-core/gnulib/alloca.h
--grub-core/gnulib/arg-nonnull.h
--grub-core/gnulib/c++defs.h
--grub-core/gnulib/charset.alias
--grub-core/gnulib/configmake.h
--grub-core/gnulib/float.h
--grub-core/gnulib/getopt.h
--grub-core/gnulib/langinfo.h
--grub-core/gnulib/ref-add.sed
--grub-core/gnulib/ref-del.sed
--grub-core/gnulib/stdio.h
--grub-core/gnulib/stdlib.h
--grub-core/gnulib/string.h
--grub-core/gnulib/strings.h
--grub-core/gnulib/sys
--grub-core/gnulib/unistd.h
--grub-core/gnulib/warn-on-use.h
--grub-core/gnulib/wchar.h
--grub-core/gnulib/wctype.h
--grub-core/rs_decoder.h
--widthspec.bin
--widthspec.h
--docs/stamp-1
--docs/version-dev.texi
--Makefile.utilgcry.def
--po/*.po
--po/*.gmo
--po/LINGUAS
--po/remove-potcdate.sed
--include/grub/gcrypt/gcrypt.h
--include/grub/gcrypt/g10lib.h
--po/POTFILES.in
--po/POTFILES-shell.in
--/grub-glue-efi
--/grub-render-label
--/grub-glue-efi.exe
--/grub-render-label.exe
--grub-core/gnulib/locale.h
--grub-core/gnulib/unitypes.h
--grub-core/gnulib/uniwidth.h
--build-aux/test-driver
-+
-+# next are things you get if you do ./configure in the topdir (for e.g.
-+# "make dist" invocation.
-+/config-util.h
-+/config.h
-+/include/grub/cpu
-+/include/grub/machine
-+/po/POTFILES
-+/stamp-h
-+/stamp-h1
-+config.log
-+config.status
-+
-+# stuff "make dist" creates
-+ChangeLog
-+grub-*.tar
-+grub-*.tar.*
-+
-+# stuff "make" creates
-+/[[:digit:]][[:digit:]]_?*
-+/ascii.h
-+/build-grub-gen-asciih
-+/build-grub-gen-widthspec
-+/build-grub-mkfont
-+/config-util.h.in
- /garbage-gen
--/garbage-gen.exe
--/grub-fs-tester
--grub-core/build-grub-module-verifier
-+/grub*-bios-setup
-+/grub*-bios-setup.8
-+/grub*-editenv
-+/grub*-editenv.1
-+/grub*-file
-+/grub*-file.1
-+/grub*-fs-tester
-+/grub*-fstest
-+/grub*-fstest.1
-+/grub*-glue-efi
-+/grub*-glue-efi.1
-+/grub*-install
-+/grub*-install.8
-+/grub*-kbdcomp
-+/grub*-kbdcomp.1
-+/grub*-macbless
-+/grub*-macbless.8
-+/grub*-menulst2cfg
-+/grub*-menulst2cfg.1
-+/grub*-mkconfig
-+/grub*-mkconfig.8
-+/grub*-mkconfig_lib
-+/grub*-mkfont
-+/grub*-mkfont.1
-+/grub*-mkimage
-+/grub*-mkimage.1
-+/grub*-mklayout
-+/grub*-mklayout.1
-+/grub*-mknetdir
-+/grub*-mknetdir.1
-+/grub*-mkpasswd-pbkdf2
-+/grub*-mkpasswd-pbkdf2.1
-+/grub*-mkrelpath
-+/grub*-mkrelpath.1
-+/grub*-mkrescue
-+/grub*-mkrescue.1
-+/grub*-mkstandalone
-+/grub*-mkstandalone.1
-+/grub*-ofpathname
-+/grub*-ofpathname.8
-+/grub*-probe
-+/grub*-probe.8
-+/grub*-reboot
-+/grub*-reboot.8
-+/grub*-render-label
-+/grub*-render-label.1
-+/grub*-script-check
-+/grub*-script-check.1
-+/grub*-set-default
-+/grub*-set-default.8
-+/grub*-shell
-+/grub*-shell-tester
-+/grub*-sparc64-setup
-+/grub*-sparc64-setup.8
-+/grub*-syslinux2cfg
-+/grub*-syslinux2cfg.1
-+/grub_fstest.pp
-+/grub_fstest_init.c
-+/grub_fstest_init.lst
-+/grub_script.tab.[ch]
-+/libgrub.pp
-+/libgrub_a_init.c
-+/libgrub_a_init.lst
-+/stamp-h.in
-+/widthspec.h
-diff --git a/build-aux/.gitignore b/build-aux/.gitignore
-new file mode 100644
-index 000000000..f2f17aab9
---- /dev/null
-+++ b/build-aux/.gitignore
-@@ -0,0 +1,9 @@
-+/compile
-+/config.guess
-+/config.sub
-+/depcomp
-+/install-sh
-+/mdate-sh
-+/missing
-+/test-driver
-+/texinfo.tex
-diff --git a/docs/.gitignore b/docs/.gitignore
-new file mode 100644
-index 000000000..91aee84d3
---- /dev/null
-+++ b/docs/.gitignore
-@@ -0,0 +1,4 @@
-+/*.in
-+/stamp-1
-+/stamp-vti
-+/version*.texi
-diff --git a/grub-core/.gitignore b/grub-core/.gitignore
-new file mode 100644
-index 000000000..c738ac6c6
---- /dev/null
-+++ b/grub-core/.gitignore
-@@ -0,0 +1,15 @@
-+/*.lst
-+/Makefile.gcry.def
-+/unidata.c
-+/build-grub-module-verifier
-+/gdb_grub
-+/genmod.sh
-+/gensyminfo.sh
-+/gentrigtables
-+/gmodule.pl
-+/grub_script.tab.[ch]
-+/modinfo.sh
-+/rs_decoder.h
-+/symlist.c
-+/symlist.h
-+/trigtables.c
-diff --git a/grub-core/gnulib/.gitignore b/grub-core/gnulib/.gitignore
-new file mode 100644
-index 000000000..29e199c2d
---- /dev/null
-+++ b/grub-core/gnulib/.gitignore
-@@ -0,0 +1,22 @@
-+/alloca.h
-+/arg-nonnull.h
-+/c++defs.h
-+/charset.alias
-+/configmake.h
-+/getopt.h
-+/langinfo.h
-+/libgnu.a
-+/locale.h
-+/ref-add.sed
-+/ref-del.sed
-+/stdio.h
-+/stdlib.h
-+/string.h
-+/strings.h
-+/sys/
-+/unistd.h
-+/unitypes.h
-+/uniwidth.h
-+/warn-on-use.h
-+/wchar.h
-+/wctype.h
-diff --git a/grub-core/lib/.gitignore b/grub-core/lib/.gitignore
-new file mode 100644
-index 000000000..681545914
---- /dev/null
-+++ b/grub-core/lib/.gitignore
-@@ -0,0 +1 @@
-+/libgcrypt-grub/
-diff --git a/include/grub/gcrypt/.gitignore b/include/grub/gcrypt/.gitignore
-new file mode 100644
-index 000000000..8fbf56462
---- /dev/null
-+++ b/include/grub/gcrypt/.gitignore
-@@ -0,0 +1,2 @@
-+g10lib.h
-+gcrypt.h
-diff --git a/po/.gitignore b/po/.gitignore
-new file mode 100644
-index 000000000..97b679c31
---- /dev/null
-+++ b/po/.gitignore
-@@ -0,0 +1,4 @@
-+/POTFILES*.in
-+/grub.pot
-+/remove-potcdate.sed
-+/stamp-po
-diff --git a/util/bash-completion.d/.gitignore b/util/bash-completion.d/.gitignore
-new file mode 100644
-index 000000000..b7e1eb124
---- /dev/null
-+++ b/util/bash-completion.d/.gitignore
-@@ -0,0 +1 @@
-+grub

SOURCES/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch

@@ -9,112 +9,94 @@ won't register commands if SB is enabled."
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- grub-core/Makefile.core.def        |  1 +
- grub-core/commands/iorw.c          |  7 +++++
- grub-core/commands/memrw.c         |  7 +++++
- grub-core/kern/dl.c                |  1 +
- grub-core/kern/efi/efi.c           | 34 --------------------
- grub-core/kern/efi/sb.c            | 64 ++++++++++++++++++++++++++++++++++++++
- grub-core/loader/efi/appleloader.c |  7 +++++
+ grub-core/commands/iorw.c          |  7 +++++++
+ grub-core/commands/memrw.c         |  7 +++++++
+ grub-core/kern/dl.c                |  3 ++-
+ grub-core/kern/efi/efi.c           | 34 ----------------------------------
+ grub-core/loader/efi/appleloader.c |  7 +++++++
  grub-core/loader/efi/chainloader.c |  1 +
- grub-core/loader/i386/bsd.c        |  7 +++++
- grub-core/loader/i386/linux.c      |  7 +++++
- grub-core/loader/i386/pc/linux.c   |  7 +++++
- grub-core/loader/multiboot.c       |  7 +++++
- grub-core/loader/xnu.c             |  7 +++++
+ grub-core/loader/i386/bsd.c        |  7 +++++++
+ grub-core/loader/i386/linux.c      |  7 +++++++
+ grub-core/loader/i386/pc/linux.c   |  7 +++++++
+ grub-core/loader/multiboot.c       |  7 +++++++
+ grub-core/loader/xnu.c             |  7 +++++++
  include/grub/efi/efi.h             |  1 -
- include/grub/efi/sb.h              | 29 +++++++++++++++++
  include/grub/ia64/linux.h          |  0
  include/grub/mips/linux.h          |  0
  include/grub/powerpc/linux.h       |  0
  include/grub/sparc64/linux.h       |  0
- grub-core/Makefile.am              |  1 +
- 20 files changed, 153 insertions(+), 35 deletions(-)
- create mode 100644 grub-core/kern/efi/sb.c
- create mode 100644 include/grub/efi/sb.h
+ 16 files changed, 59 insertions(+), 36 deletions(-)
  create mode 100644 include/grub/ia64/linux.h
  create mode 100644 include/grub/mips/linux.h
  create mode 100644 include/grub/powerpc/linux.h
  create mode 100644 include/grub/sparc64/linux.h
 
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 0b4b0c212..e92a7ef32 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -195,6 +195,7 @@ kernel = {
-   i386_multiboot = kern/i386/pc/acpi.c;
-   i386_coreboot = kern/acpi.c;
-   i386_multiboot = kern/acpi.c;
-+  common = kern/efi/sb.c;
- 
-   x86 = kern/i386/tsc.c;
-   x86 = kern/i386/tsc_pit.c;
 diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
-index a0c164e54..41a7f3f04 100644
+index 584baec8f91..7b2999b14b5 100644
 --- a/grub-core/commands/iorw.c
 +++ b/grub-core/commands/iorw.c
-@@ -23,6 +23,7 @@
- #include <grub/env.h>
+@@ -24,6 +24,7 @@
  #include <grub/cpu/io.h>
  #include <grub/i18n.h>
+ #include <grub/lockdown.h>
 +#include <grub/efi/sb.h>
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -118,6 +119,9 @@ grub_cmd_write (grub_command_t cmd, int argc, char **argv)
+@@ -119,6 +120,9 @@ grub_cmd_write (grub_command_t cmd, int argc, char **argv)
  
  GRUB_MOD_INIT(memrw)
  {
-+  if (grub_efi_secure_boot())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +    return;
 +
    cmd_read_byte =
      grub_register_extcmd ("inb", grub_cmd_read, 0,
  			  N_("PORT"), N_("Read 8-bit value from PORT."),
-@@ -146,6 +150,9 @@ GRUB_MOD_INIT(memrw)
+@@ -147,6 +151,9 @@ GRUB_MOD_INIT(memrw)
  
  GRUB_MOD_FINI(memrw)
  {
-+  if (grub_efi_secure_boot())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +    return;
 +
    grub_unregister_extcmd (cmd_read_byte);
    grub_unregister_extcmd (cmd_read_word);
    grub_unregister_extcmd (cmd_read_dword);
 diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c
-index 98769eadb..088cbe9e2 100644
+index d401a6db0ef..39cf3a06dbd 100644
 --- a/grub-core/commands/memrw.c
 +++ b/grub-core/commands/memrw.c
-@@ -22,6 +22,7 @@
- #include <grub/extcmd.h>
+@@ -23,6 +23,7 @@
  #include <grub/env.h>
  #include <grub/i18n.h>
+ #include <grub/lockdown.h>
 +#include <grub/efi/sb.h>
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -120,6 +121,9 @@ grub_cmd_write (grub_command_t cmd, int argc, char **argv)
+@@ -121,6 +122,9 @@ grub_cmd_write (grub_command_t cmd, int argc, char **argv)
  
  GRUB_MOD_INIT(memrw)
  {
-+  if (grub_efi_secure_boot())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +    return;
 +
    cmd_read_byte =
      grub_register_extcmd ("read_byte", grub_cmd_read, 0,
  			  N_("ADDR"), N_("Read 8-bit value from ADDR."),
-@@ -148,6 +152,9 @@ GRUB_MOD_INIT(memrw)
+@@ -149,6 +153,9 @@ GRUB_MOD_INIT(memrw)
  
  GRUB_MOD_FINI(memrw)
  {
-+  if (grub_efi_secure_boot())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +    return;
 +
    grub_unregister_extcmd (cmd_read_byte);
    grub_unregister_extcmd (cmd_read_word);
    grub_unregister_extcmd (cmd_read_dword);
 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 04e804d16..621070918 100644
+index b7149370950..7afb9e6f724 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
 @@ -32,6 +32,7 @@
@@ -125,12 +107,21 @@ index 04e804d16..621070918 100644
  
  /* Platforms where modules are in a readonly area of memory.  */
  #if defined(GRUB_MACHINE_QEMU)
+@@ -704,7 +705,7 @@ grub_dl_load_file (const char *filename)
+   grub_dl_t mod = 0;
+ 
+ #ifdef GRUB_MACHINE_EFI
+-  if (grub_efi_secure_boot ())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
+     {
+ #if 0
+       /* This is an error, but grub2-mkconfig still generates a pile of
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 91129e335..708581fcb 100644
+index 4a2259aa1c7..8cff7be0289 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -273,40 +273,6 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
-   return NULL;
+@@ -286,40 +286,6 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
+   return grub_efi_get_variable_with_attributes (var, guid, datasize_out, data_out, NULL);
  }
  
 -grub_efi_boolean_t
@@ -170,78 +161,8 @@ index 91129e335..708581fcb 100644
  #pragma GCC diagnostic ignored "-Wcast-align"
  
  /* Search the mods section from the PE32/PE32+ image. This code uses
-diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c
-new file mode 100644
-index 000000000..d74778b0c
---- /dev/null
-+++ b/grub-core/kern/efi/sb.c
-@@ -0,0 +1,64 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2014 Free Software Foundation, Inc.
-+ *
-+ *  GRUB is free software: you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation, either version 3 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  GRUB is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <grub/err.h>
-+#include <grub/mm.h>
-+#include <grub/types.h>
-+#include <grub/cpu/linux.h>
-+#include <grub/efi/efi.h>
-+#include <grub/efi/pe32.h>
-+#include <grub/efi/linux.h>
-+#include <grub/efi/sb.h>
-+
-+int
-+grub_efi_secure_boot (void)
-+{
-+#ifdef GRUB_MACHINE_EFI
-+  grub_efi_guid_t efi_var_guid = GRUB_EFI_GLOBAL_VARIABLE_GUID;
-+  grub_size_t datasize;
-+  char *secure_boot = NULL;
-+  char *setup_mode = NULL;
-+  grub_efi_boolean_t ret = 0;
-+
-+  secure_boot = grub_efi_get_variable("SecureBoot", &efi_var_guid, &datasize);
-+  if (datasize != 1 || !secure_boot)
-+    {
-+      grub_dprintf ("secureboot", "No SecureBoot variable\n");
-+      goto out;
-+    }
-+  grub_dprintf ("secureboot", "SecureBoot: %d\n", *secure_boot);
-+
-+  setup_mode = grub_efi_get_variable("SetupMode", &efi_var_guid, &datasize);
-+  if (datasize != 1 || !setup_mode)
-+    {
-+      grub_dprintf ("secureboot", "No SetupMode variable\n");
-+      goto out;
-+    }
-+  grub_dprintf ("secureboot", "SetupMode: %d\n", *setup_mode);
-+
-+  if (*secure_boot && !*setup_mode)
-+    ret = 1;
-+
-+ out:
-+  grub_free (secure_boot);
-+  grub_free (setup_mode);
-+  return ret;
-+#else
-+  return 0;
-+#endif
-+}
 diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c
-index 74888c463..69c2a10d3 100644
+index 74888c463ba..585f2b57385 100644
 --- a/grub-core/loader/efi/appleloader.c
 +++ b/grub-core/loader/efi/appleloader.c
 @@ -24,6 +24,7 @@
@@ -256,7 +177,7 @@ index 74888c463..69c2a10d3 100644
  
  GRUB_MOD_INIT(appleloader)
  {
-+  if (grub_efi_secure_boot())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +    return;
 +
    cmd = grub_register_command ("appleloader", grub_cmd_appleloader,
@@ -266,13 +187,13 @@ index 74888c463..69c2a10d3 100644
  
  GRUB_MOD_FINI(appleloader)
  {
-+  if (grub_efi_secure_boot())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +    return;
 +
    grub_unregister_command (cmd);
  }
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index af2189619..5cd9b6e08 100644
+index b54cf6986fc..3ff305b1d32 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -34,6 +34,7 @@
@@ -284,10 +205,10 @@ index af2189619..5cd9b6e08 100644
  #include <grub/i18n.h>
  #include <grub/net.h>
 diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
-index 7f96515da..87709aa23 100644
+index 5f3290ce17b..54befc26626 100644
 --- a/grub-core/loader/i386/bsd.c
 +++ b/grub-core/loader/i386/bsd.c
-@@ -38,6 +38,7 @@
+@@ -40,6 +40,7 @@
  #ifdef GRUB_MACHINE_PCBIOS
  #include <grub/machine/int.h>
  #endif
@@ -295,92 +216,92 @@ index 7f96515da..87709aa23 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -2124,6 +2125,9 @@ static grub_command_t cmd_netbsd_module_elf, cmd_openbsd_ramdisk;
+@@ -2137,6 +2138,9 @@ static grub_command_t cmd_netbsd_module_elf, cmd_openbsd_ramdisk;
  
  GRUB_MOD_INIT (bsd)
  {
-+  if (grub_efi_secure_boot())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +    return;
 +
    /* Net and OpenBSD kernels are often compressed.  */
    grub_dl_load ("gzio");
  
-@@ -2163,6 +2167,9 @@ GRUB_MOD_INIT (bsd)
+@@ -2176,6 +2180,9 @@ GRUB_MOD_INIT (bsd)
  
  GRUB_MOD_FINI (bsd)
  {
-+  if (grub_efi_secure_boot())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +    return;
 +
    grub_unregister_extcmd (cmd_freebsd);
    grub_unregister_extcmd (cmd_openbsd);
    grub_unregister_extcmd (cmd_netbsd);
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index f7186be40..c84747ea8 100644
+index dccf3bb3005..4aeb0e4b9a6 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
-@@ -35,6 +35,7 @@
- #include <grub/i18n.h>
- #include <grub/lib/cmdline.h>
+@@ -37,6 +37,7 @@
  #include <grub/linux.h>
+ #include <grub/machine/kernel.h>
+ #include <grub/safemath.h>
 +#include <grub/efi/sb.h>
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -1156,6 +1157,9 @@ static grub_command_t cmd_linux, cmd_initrd;
+@@ -1138,6 +1139,9 @@ static grub_command_t cmd_linux, cmd_initrd;
  
  GRUB_MOD_INIT(linux)
  {
-+  if (grub_efi_secure_boot())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +    return;
 +
    cmd_linux = grub_register_command ("linux", grub_cmd_linux,
  				     0, N_("Load Linux."));
    cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
-@@ -1165,6 +1169,9 @@ GRUB_MOD_INIT(linux)
+@@ -1147,6 +1151,9 @@ GRUB_MOD_INIT(linux)
  
  GRUB_MOD_FINI(linux)
  {
-+  if (grub_efi_secure_boot())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +    return;
 +
    grub_unregister_command (cmd_linux);
    grub_unregister_command (cmd_initrd);
  }
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index caa76bee8..783a3cd93 100644
+index 4b1750e360e..e3fa1221e81 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
-@@ -35,6 +35,7 @@
- #include <grub/i386/floppy.h>
+@@ -36,6 +36,7 @@
  #include <grub/lib/cmdline.h>
  #include <grub/linux.h>
+ #include <grub/safemath.h>
 +#include <grub/efi/sb.h>
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -480,6 +481,9 @@ static grub_command_t cmd_linux, cmd_linux16, cmd_initrd, cmd_initrd16;
+@@ -487,6 +488,9 @@ static grub_command_t cmd_linux, cmd_linux16, cmd_initrd, cmd_initrd16;
  
  GRUB_MOD_INIT(linux16)
  {
-+  if (grub_efi_secure_boot())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +    return;
 +
    cmd_linux =
      grub_register_command ("linux", grub_cmd_linux,
  			   0, N_("Load Linux."));
-@@ -497,6 +501,9 @@ GRUB_MOD_INIT(linux16)
+@@ -504,6 +508,9 @@ GRUB_MOD_INIT(linux16)
  
  GRUB_MOD_FINI(linux16)
  {
-+  if (grub_efi_secure_boot())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +    return;
 +
    grub_unregister_command (cmd_linux);
    grub_unregister_command (cmd_linux16);
    grub_unregister_command (cmd_initrd);
 diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
-index 40c67e824..26df46a41 100644
+index facb13f3d36..47e481f4576 100644
 --- a/grub-core/loader/multiboot.c
 +++ b/grub-core/loader/multiboot.c
 @@ -50,6 +50,7 @@
@@ -391,63 +312,63 @@ index 40c67e824..26df46a41 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -446,6 +447,9 @@ static grub_command_t cmd_multiboot, cmd_module;
+@@ -444,6 +445,9 @@ static grub_command_t cmd_multiboot, cmd_module;
  
  GRUB_MOD_INIT(multiboot)
  {
-+  if (grub_efi_secure_boot())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +    return;
 +
    cmd_multiboot =
  #ifdef GRUB_USE_MULTIBOOT2
      grub_register_command ("multiboot2", grub_cmd_multiboot,
-@@ -466,6 +470,9 @@ GRUB_MOD_INIT(multiboot)
+@@ -464,6 +468,9 @@ GRUB_MOD_INIT(multiboot)
  
  GRUB_MOD_FINI(multiboot)
  {
-+  if (grub_efi_secure_boot())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +    return;
 +
    grub_unregister_command (cmd_multiboot);
    grub_unregister_command (cmd_module);
  }
 diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index c9885b1bc..df8dfdb4b 100644
+index 1c0cf6a430a..baa54e652ab 100644
 --- a/grub-core/loader/xnu.c
 +++ b/grub-core/loader/xnu.c
-@@ -33,6 +33,7 @@
- #include <grub/extcmd.h>
- #include <grub/env.h>
+@@ -35,6 +35,7 @@
  #include <grub/i18n.h>
+ #include <grub/verify.h>
+ #include <grub/safemath.h>
 +#include <grub/efi/sb.h>
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -1469,6 +1470,9 @@ static grub_extcmd_t cmd_splash;
+@@ -1497,6 +1498,9 @@ static grub_extcmd_t cmd_splash;
  
  GRUB_MOD_INIT(xnu)
  {
-+  if (grub_efi_secure_boot())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +    return;
 +
    cmd_kernel = grub_register_command ("xnu_kernel", grub_cmd_xnu_kernel, 0,
  				      N_("Load XNU image."));
    cmd_kernel64 = grub_register_command ("xnu_kernel64", grub_cmd_xnu_kernel64,
-@@ -1509,6 +1513,9 @@ GRUB_MOD_INIT(xnu)
+@@ -1540,6 +1544,9 @@ GRUB_MOD_INIT(xnu)
  
  GRUB_MOD_FINI(xnu)
  {
-+  if (grub_efi_secure_boot())
++  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
 +    return;
 +
  #ifndef GRUB_MACHINE_EMU
    grub_unregister_command (cmd_resume);
  #endif
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 1061aee97..39480b386 100644
+index 6295df85f3f..585fa6662b6 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
-@@ -85,7 +85,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
+@@ -91,7 +91,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
  				     const grub_efi_guid_t *guid,
  				     void *data,
  				     grub_size_t datasize);
@@ -455,62 +376,15 @@ index 1061aee97..39480b386 100644
  int
  EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,
  					     const grub_efi_device_path_t *dp2);
-diff --git a/include/grub/efi/sb.h b/include/grub/efi/sb.h
-new file mode 100644
-index 000000000..9629fbb0f
---- /dev/null
-+++ b/include/grub/efi/sb.h
-@@ -0,0 +1,29 @@
-+/* sb.h - declare functions for EFI Secure Boot support */
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
-+ *
-+ *  GRUB is free software: you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation, either version 3 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  GRUB is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef GRUB_EFI_SB_HEADER
-+#define GRUB_EFI_SB_HEADER	1
-+
-+#include <grub/types.h>
-+#include <grub/dl.h>
-+
-+/* Functions.  */
-+int EXPORT_FUNC (grub_efi_secure_boot) (void);
-+
-+#endif /* ! GRUB_EFI_SB_HEADER */
 diff --git a/include/grub/ia64/linux.h b/include/grub/ia64/linux.h
 new file mode 100644
-index 000000000..e69de29bb
+index 00000000000..e69de29bb2d
 diff --git a/include/grub/mips/linux.h b/include/grub/mips/linux.h
 new file mode 100644
-index 000000000..e69de29bb
+index 00000000000..e69de29bb2d
 diff --git a/include/grub/powerpc/linux.h b/include/grub/powerpc/linux.h
 new file mode 100644
-index 000000000..e69de29bb
+index 00000000000..e69de29bb2d
 diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h
 new file mode 100644
-index 000000000..e69de29bb
-diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index f4ff62b76..9c69aa886 100644
---- a/grub-core/Makefile.am
-+++ b/grub-core/Makefile.am
-@@ -71,6 +71,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/disk.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dl.h
-+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/sb.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
+index 00000000000..e69de29bb2d

SOURCES/0009-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
-Date: Tue, 14 Feb 2017 16:18:54 -0500
+Date: Mon, 8 Jul 2019 12:32:37 +0200
 Subject: [PATCH] Handle multi-arch (64-on-32) boot in linuxefi loader.
 
 Allow booting 64-bit kernels on 32-bit EFI on x86.
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  3 files changed, 89 insertions(+), 37 deletions(-)
 
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index c8ecce6df..0622dfa48 100644
+index c8ecce6dfd0..0622dfa48d4 100644
 --- a/grub-core/loader/efi/linux.c
 +++ b/grub-core/loader/efi/linux.c
 @@ -69,12 +69,17 @@ grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
@@ -37,7 +37,7 @@ index c8ecce6df..0622dfa48 100644
  
    return GRUB_ERR_BUG;
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 8db228c5b..800c3e540 100644
+index 6b24cbb9483..3017d0f3e52 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -44,14 +44,10 @@ static char *linux_cmdline;
@@ -57,12 +57,12 @@ index 8db228c5b..800c3e540 100644
  			      params);
  }
  
-@@ -154,14 +150,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+@@ -153,14 +149,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
    return grub_errno;
  }
  
 +#define MIN(a, b) \
-+  ({ typeof (a) _a = (a); \
++  ({ typeof (a) _a = (a);  \
 +     typeof (b) _b = (b); \
 +     _a < _b ? _a : _b; })
 +
@@ -71,7 +71,7 @@ index 8db228c5b..800c3e540 100644
  		int argc, char *argv[])
  {
    grub_file_t file = 0;
--  struct linux_kernel_header lh;
+-  struct linux_i386_kernel_header lh;
 -  grub_ssize_t len, start, filelen;
 +  struct linux_i386_kernel_header *lh = NULL;
 +  grub_ssize_t start, filelen;
@@ -80,7 +80,7 @@ index 8db228c5b..800c3e540 100644
    int rc;
  
    grub_dl_ref (my_mod);
-@@ -201,48 +203,79 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -200,48 +202,79 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -172,12 +172,13 @@ index 8db228c5b..800c3e540 100644
    if (!linux_cmdline)
      {
        grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate cmdline"));
-@@ -255,21 +288,23 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -254,22 +287,24 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    grub_memcpy (linux_cmdline, LINUX_IMAGE, sizeof (LINUX_IMAGE));
    grub_create_loader_cmdline (argc, argv,
                                linux_cmdline + sizeof (LINUX_IMAGE) - 1,
--			      lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1));
-+			      lh->cmdline_size - (sizeof (LINUX_IMAGE) - 1));
+-			      lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1),
++			      lh->cmdline_size - (sizeof (LINUX_IMAGE) - 1),
+ 			      GRUB_VERIFY_KERNEL_CMDLINE);
  
 -  lh.cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
 +  grub_dprintf ("linux", "cmdline:%s\n", linux_cmdline);
@@ -244,10 +245,10 @@ index 8db228c5b..800c3e540 100644
    if (kernel_mem && !loaded)
      grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,
 diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
-index bb19dbd5a..8474a857e 100644
+index eddf9251d9a..25ef52c04eb 100644
 --- a/include/grub/i386/linux.h
 +++ b/include/grub/i386/linux.h
-@@ -133,7 +133,12 @@ struct linux_i386_kernel_header
+@@ -138,7 +138,12 @@ struct linux_i386_kernel_header
    grub_uint32_t kernel_alignment;
    grub_uint8_t relocatable;
    grub_uint8_t min_alignment;

SOURCES/0010-re-write-.gitignore.patch

@@ -0,0 +1,248 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 8 Jul 2019 12:55:29 +0200
+Subject: [PATCH] re-write .gitignore
+
+---
+ .gitignore                        | 152 ++++++++++++++++++++++++++++++++++++++
+ docs/.gitignore                   |   5 ++
+ grub-core/.gitignore              |  16 ++++
+ grub-core/lib/.gitignore          |   1 +
+ include/grub/gcrypt/.gitignore    |   2 +
+ po/.gitignore                     |   5 ++
+ util/bash-completion.d/.gitignore |   2 +
+ 7 files changed, 183 insertions(+)
+ create mode 100644 docs/.gitignore
+ create mode 100644 grub-core/.gitignore
+ create mode 100644 grub-core/lib/.gitignore
+ create mode 100644 include/grub/gcrypt/.gitignore
+ create mode 100644 po/.gitignore
+ create mode 100644 util/bash-completion.d/.gitignore
+
+diff --git a/.gitignore b/.gitignore
+index f6a1bd05175..594d0134d33 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -275,3 +275,155 @@ widthspec.bin
+ /xfs_test
+ /xzcompress_test
+ /zfs_test
++=======
++# things ./autogen.sh will create
++/Makefile.utilgcry.def
++/ABOUT-NLS
++/aclocal.m4
++/autom4te.cache
++/build-aux
++/configure
++/gnulib
++/grub-core/lib/gnulib/
++/Makefile
++
++# things very common editors create that we never want
++*~
++.*.sw?
++*.patch
++
++# stuff you're likely to make while building test trees
++grub.cfg
++/build*/
++
++# built objects across the whole tree
++Makefile.in
++*.a
++*.am
++*.efi
++*.exec
++*.image
++*.img
++*.info
++*.lst
++*.marker
++/m4
++*.mod
++*.module
++*.o
++*.pf2
++*.yy.[ch]
++.deps/
++.deps-core/
++.deps-util/
++.dirstamp
++
++# next are things you get if you do ./configure in the topdir (for e.g.
++# "make dist" invocation.
++/config-util.h
++/config.h
++/include/grub/cpu
++/include/grub/machine
++/INSTALL
++/INSTALL.grub
++/po/Makefile.in.in
++/po/Makevars
++/po/Makevars.template
++/po/POTFILES
++/po/Rules-quot
++/stamp-h
++/stamp-h1
++bootstrap.log
++config.log
++config.status
++
++# stuff "make dist" creates
++ChangeLog
++grub-*.tar
++grub-*.tar.*
++
++# stuff "make" creates
++/[[:digit:]][[:digit:]]_?*
++/ascii.h
++/build-grub-gen-asciih
++/build-grub-gen-widthspec
++/build-grub-mkfont
++/config-util.h.in
++/garbage-gen
++/grub*-bios-setup
++/grub*-bios-setup.8
++/grub*-editenv
++/grub*-editenv.1
++/grub*-file
++/grub*-file.1
++/grub*-fs-tester
++/grub*-fstest
++/grub*-fstest.1
++/grub*-get-kernel-settings
++/grub*-get-kernel-settings.3
++/grub*-glue-efi
++/grub*-glue-efi.1
++/grub*-install
++/grub*-install.8
++/grub*-kbdcomp
++/grub*-kbdcomp.1
++/grub*-macbless
++/grub*-macbless.8
++/grub*-menulst2cfg
++/grub*-menulst2cfg.1
++/grub*-mount
++/grub*-mount.1
++/grub*-mkconfig
++/grub*-mkconfig.8
++/grub*-mkconfig_lib
++/grub*-mkfont
++/grub*-mkfont.1
++/grub*-mkimage
++/grub*-mkimage.1
++/grub*-mklayout
++/grub*-mklayout.1
++/grub*-mknetdir
++/grub*-mknetdir.1
++/grub*-mkpasswd-pbkdf2
++/grub*-mkpasswd-pbkdf2.1
++/grub*-mkrelpath
++/grub*-mkrelpath.1
++/grub*-mkrescue
++/grub*-mkrescue.1
++/grub*-mkstandalone
++/grub*-mkstandalone.1
++/grub*-ofpathname
++/grub*-ofpathname.8
++/grub*-probe
++/grub*-probe.8
++/grub*-reboot
++/grub*-reboot.8
++/grub*-render-label
++/grub*-render-label.1
++/grub*-rpm-sort
++/grub*-rpm-sort.8
++/grub*-script-check
++/grub*-script-check.1
++/grub*-set-bootflag
++/grub*-set-bootflag.1
++/grub*-set-default
++/grub*-set-default.8
++/grub*-set-password
++/grub*-set-password.8
++/grub*-shell
++/grub*-shell-tester
++/grub*-sparc64-setup
++/grub*-sparc64-setup.8
++/grub*-syslinux2cfg
++/grub*-syslinux2cfg.1
++/grub*-switch-to-blscfg
++/grub*-switch-to-blscfg.8
++/grub_fstest.pp
++/grub_fstest_init.c
++/grub_fstest_init.lst
++/grub_script.tab.[ch]
++/libgrub.pp
++/libgrub_a_init.c
++/libgrub_a_init.lst
++/stamp-h.in
++/widthspec.h
+diff --git a/docs/.gitignore b/docs/.gitignore
+new file mode 100644
+index 00000000000..e1d849ef95b
+--- /dev/null
++++ b/docs/.gitignore
+@@ -0,0 +1,5 @@
++/*.in
++/Makefile
++/stamp-1
++/stamp-vti
++/version*.texi
+diff --git a/grub-core/.gitignore b/grub-core/.gitignore
+new file mode 100644
+index 00000000000..2acce281159
+--- /dev/null
++++ b/grub-core/.gitignore
+@@ -0,0 +1,16 @@
++/*.lst
++/Makefile
++/Makefile.gcry.def
++/unidata.c
++/build-grub-module-verifier
++/gdb_grub
++/genmod.sh
++/gensyminfo.sh
++/gentrigtables
++/gmodule.pl
++/grub_script.tab.[ch]
++/modinfo.sh
++/rs_decoder.h
++/symlist.c
++/symlist.h
++/trigtables.c
+diff --git a/grub-core/lib/.gitignore b/grub-core/lib/.gitignore
+new file mode 100644
+index 00000000000..68154591404
+--- /dev/null
++++ b/grub-core/lib/.gitignore
+@@ -0,0 +1 @@
++/libgcrypt-grub/
+diff --git a/include/grub/gcrypt/.gitignore b/include/grub/gcrypt/.gitignore
+new file mode 100644
+index 00000000000..8fbf5646246
+--- /dev/null
++++ b/include/grub/gcrypt/.gitignore
+@@ -0,0 +1,2 @@
++g10lib.h
++gcrypt.h
+diff --git a/po/.gitignore b/po/.gitignore
+new file mode 100644
+index 00000000000..f507e7741e3
+--- /dev/null
++++ b/po/.gitignore
+@@ -0,0 +1,5 @@
++/Makefile
++/POTFILES*.in
++/grub.pot
++/remove-potcdate.sed
++/stamp-po
+diff --git a/util/bash-completion.d/.gitignore b/util/bash-completion.d/.gitignore
+new file mode 100644
+index 00000000000..6813a527ad3
+--- /dev/null
++++ b/util/bash-completion.d/.gitignore
+@@ -0,0 +1,2 @@
++Makefile
++grub

SOURCES/0011-Honor-a-symlink-when-generating-configuration-by-gru.patch

@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Marcel Kolaja <mkolaja@redhat.com>
-Date: Tue, 21 Jan 2014 10:57:08 -0500
-Subject: [PATCH] Honor a symlink when generating configuration by
- grub2-mkconfig
-
-Honor a symlink when generating configuration by grub2-mkconfig, so that
-the -o option follows it rather than overwriting it with a regular file.
----
- util/grub-mkconfig.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 33332360e..bc5a3f175 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -287,7 +287,8 @@ and /etc/grub.d/* files or please file a bug report with
-     exit 1
-   else
-     # none of the children aborted with error, install the new grub.cfg
--    mv -f ${grub_cfg}.new ${grub_cfg}
-+    cat ${grub_cfg}.new > ${grub_cfg}
-+    rm -f ${grub_cfg}.new
-   fi
- fi
- 

SOURCES/0011-IBM-client-architecture-CAS-reboot-support.patch

@@ -25,10 +25,10 @@ parameters
  4 files changed, 91 insertions(+)
 
 diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
-index 62929d983..2d53c0e86 100644
+index 4d493ab7661..3a6689abb11 100644
 --- a/grub-core/kern/ieee1275/openfw.c
 +++ b/grub-core/kern/ieee1275/openfw.c
-@@ -588,3 +588,66 @@ grub_ieee1275_get_boot_dev (void)
+@@ -591,3 +591,66 @@ grub_ieee1275_get_boot_dev (void)
  
    return bootpath;
  }
@@ -96,10 +96,10 @@ index 62929d983..2d53c0e86 100644
 +  return 0;
 +}
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 78a70a8bf..249e19bc7 100644
+index c4ebe9e22ad..70614de1565 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -33,6 +33,9 @@
+@@ -34,6 +34,9 @@
  #include <grub/charset.h>
  #include <grub/script_sh.h>
  #include <grub/bufio.h>
@@ -109,7 +109,7 @@ index 78a70a8bf..249e19bc7 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -275,6 +278,22 @@ grub_normal_execute (const char *config, int nested, int batch)
+@@ -276,6 +279,22 @@ grub_normal_execute (const char *config, int nested, int batch)
      {
        menu = read_config_file (config);
  
@@ -133,20 +133,20 @@ index 78a70a8bf..249e19bc7 100644
        grub_errno = GRUB_ERR_NONE;
      }
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index a8502d907..ab78ca87f 100644
+index 25158407dd8..ad80399246a 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
-@@ -27,6 +27,9 @@
- #include <grub/normal.h>
+@@ -28,6 +28,9 @@
  #include <grub/extcmd.h>
  #include <grub/i18n.h>
+ #include <grub/verify.h>
 +#ifdef GRUB_MACHINE_IEEE1275
 +#include <grub/ieee1275/ieee1275.h>
 +#endif
  
  /* Max digits for a char is 3 (0xFF is 255), similarly for an int it
     is sizeof (int) * 3, and one extra for a possible -ve sign.  */
-@@ -877,6 +880,10 @@ grub_script_execute_sourcecode (const char *source)
+@@ -883,6 +886,10 @@ grub_script_execute_sourcecode (const char *source)
    grub_err_t ret = 0;
    struct grub_script *parsed_script;
  
@@ -158,10 +158,10 @@ index a8502d907..ab78ca87f 100644
      {
        char *line;
 diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index 8868f3a75..2310f33db 100644
+index 73e2f464475..0a599607f31 100644
 --- a/include/grub/ieee1275/ieee1275.h
 +++ b/include/grub/ieee1275/ieee1275.h
-@@ -252,6 +252,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali
+@@ -254,6 +254,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali
  void EXPORT_FUNC(grub_ieee1275_children_peer) (struct grub_ieee1275_devalias *alias);
  void EXPORT_FUNC(grub_ieee1275_children_first) (const char *devpath,
  						struct grub_ieee1275_devalias *alias);

SOURCES/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch

@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
-index d317efa36..29df35e6d 100644
+index 85ecf06b4df..05c88dcf49e 100644
 --- a/grub-core/term/terminfo.c
 +++ b/grub-core/term/terminfo.c
 @@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term,

SOURCES/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch

@@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=973205
  3 files changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
-index 3e12e6b24..3e14f5393 100644
+index 20cbbd761ec..04df9d2c667 100644
 --- a/grub-core/kern/ieee1275/cmain.c
 +++ b/grub-core/kern/ieee1275/cmain.c
 @@ -90,7 +90,10 @@ grub_ieee1275_find_options (void)
@@ -28,7 +28,7 @@ index 3e12e6b24..3e14f5393 100644
    /* Old Macs have no key repeat, newer ones have fully working one.
       The ones inbetween when repeated key generates an escaoe sequence
 diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c
-index 17a3dbbb5..b8e4b3feb 100644
+index 17a3dbbb575..b8e4b3feb32 100644
 --- a/grub-core/video/ieee1275.c
 +++ b/grub-core/video/ieee1275.c
 @@ -352,9 +352,12 @@ static struct grub_video_adapter grub_video_ieee1275_adapter =
@@ -48,14 +48,14 @@ index 17a3dbbb5..b8e4b3feb 100644
  
  GRUB_MOD_FINI(ieee1275_fb)
 diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index 2310f33db..ca08bd966 100644
+index 0a599607f31..b5a1d49bbc3 100644
 --- a/include/grub/ieee1275/ieee1275.h
 +++ b/include/grub/ieee1275/ieee1275.h
-@@ -146,6 +146,8 @@ enum grub_ieee1275_flag
-   GRUB_IEEE1275_FLAG_BROKEN_REPEAT,
- 
+@@ -148,6 +148,8 @@ enum grub_ieee1275_flag
    GRUB_IEEE1275_FLAG_CURSORONOFF_ANSI_BROKEN,
-+
+ 
+   GRUB_IEEE1275_FLAG_RAW_DEVNAMES,
++  
 +  GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT
  };
  

SOURCES/0014-Move-bash-completion-script-922997.patch

@@ -10,10 +10,10 @@ Apparently these go in a new place now.
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index c7888e40f..783118ccd 100644
+index 7517fc49d98..8331f95b645 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -289,6 +289,14 @@ AC_SUBST(grubdirname)
+@@ -314,6 +314,14 @@ AC_SUBST(grubdirname)
  AC_DEFINE_UNQUOTED(GRUB_DIR_NAME, "$grubdirname",
      [Default grub directory name])
  
@@ -28,7 +28,7 @@ index c7888e40f..783118ccd 100644
  #
  # Checks for build programs.
  #
-@@ -498,6 +506,9 @@ HOST_CFLAGS="$HOST_CFLAGS $grub_cv_cc_w_extra_flags"
+@@ -525,6 +533,9 @@ HOST_CFLAGS="$HOST_CFLAGS $grub_cv_cc_w_extra_flags"
  # Check for target programs.
  #
  
@@ -39,7 +39,7 @@ index c7888e40f..783118ccd 100644
  if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then
    tmp_ac_tool_prefix="$ac_tool_prefix"
 diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am
-index 136287cf1..61108f054 100644
+index 136287cf1bf..61108f05429 100644
 --- a/util/bash-completion.d/Makefile.am
 +++ b/util/bash-completion.d/Makefile.am
 @@ -6,7 +6,6 @@ EXTRA_DIST = $(bash_completion_source)

SOURCES/0015-Add-GRUB_DISABLE_UUID.patch

@@ -1,106 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 4 Sep 2014 16:49:25 -0400
-Subject: [PATCH] Add GRUB_DISABLE_UUID.
-
-This will cause "search --fs-uuid --set=root ..." not to be generated by
-grub2-mkconfig, and instead simply attempt to use the grub device name
-as it understands it.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- docs/grub.texi            |  7 +++++++
- util/grub-mkconfig.in     | 22 +++++++++++++++++++---
- util/grub-mkconfig_lib.in |  4 ++--
- 3 files changed, 28 insertions(+), 5 deletions(-)
-
-diff --git a/docs/grub.texi b/docs/grub.texi
-index 2adfa97be..2fd32608c 100644
---- a/docs/grub.texi
-+++ b/docs/grub.texi
-@@ -1441,6 +1441,13 @@ enable the use of partition UUIDs, set this option to @samp{false}.
- If this option is set to @samp{true}, disable the generation of recovery
- mode menu entries.
- 
-+@item GRUB_DISABLE_UUID
-+Normally, @command{grub-mkconfig} will generate menu entries that use
-+universally-unique identifiers (UUIDs) to identify various filesystems to
-+search for files.  This is usually more reliable, but in some cases it may
-+not be appropriate.  To disable this use of UUIDs, set this option to
-+@samp{true}.
-+
- @item GRUB_VIDEO_BACKEND
- If graphical video support is required, either because the @samp{gfxterm}
- graphical terminal is in use or because @samp{GRUB_GFXPAYLOAD_LINUX} is set,
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index bc5a3f175..b0a8626dd 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -133,12 +133,12 @@ fi
- 
- # Device containing our userland.  Typically used for root= parameter.
- GRUB_DEVICE="`${grub_probe} --target=device /`"
--GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
--GRUB_DEVICE_PARTUUID="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2> /dev/null`" || true
-+GRUB_DEVICE_UUID_GENERATED="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
-+GRUB_DEVICE_PARTUUID_GENERATED="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2> /dev/null`" || true
- 
- # Device containing our /boot partition.  Usually the same as GRUB_DEVICE.
- GRUB_DEVICE_BOOT="`${grub_probe} --target=device /boot`"
--GRUB_DEVICE_BOOT_UUID="`${grub_probe} --device ${GRUB_DEVICE_BOOT} --target=fs_uuid 2> /dev/null`" || true
-+GRUB_DEVICE_BOOT_UUID_GENERATED="`${grub_probe} --device ${GRUB_DEVICE_BOOT} --target=fs_uuid 2> /dev/null`" || true
- 
- # Filesystem for the device containing our userland.  Used for stuff like
- # choosing Hurd filesystem module.
-@@ -158,6 +158,21 @@ if test -f ${sysconfdir}/default/grub ; then
-   . ${sysconfdir}/default/grub
- fi
- 
-+if [ "x$GRUB_DISABLE_UUID" != "xtrue" ]; then
-+  if [ -z "$GRUB_DEVICE_UUID" ]; then
-+    GRUB_DEVICE_UUID="$GRUB_DEVICE_UUID_GENERATED"
-+  fi
-+  if [ -z "$GRUB_DEVICE_BOOT_UUID" ]; then
-+    GRUB_DEVICE_BOOT_UUID="$GRUB_DEVICE_BOOT_UUID_GENERATED"
-+  fi
-+  if [ -z "$GRUB_DEVICE_UUID" ]; then
-+    GRUB_DEVICE_UUID="$GRUB_DEVICE_UUID_GENERATED"
-+  fi
-+  if [ -z "$GRUB_DEVICE_PART_UUID" ]; then
-+    GRUB_DEVICE_PART_UUID="$GRUB_DEVICE_PART_UUID_GENERATED"
-+  fi
-+fi
-+
- # XXX: should this be deprecated at some point?
- if [ "x${GRUB_TERMINAL}" != "x" ] ; then
-   GRUB_TERMINAL_INPUT="${GRUB_TERMINAL}"
-@@ -227,6 +242,7 @@ export GRUB_DEFAULT \
-   GRUB_DISABLE_LINUX_UUID \
-   GRUB_DISABLE_LINUX_PARTUUID \
-   GRUB_DISABLE_RECOVERY \
-+  GRUB_DISABLE_UUID \
-   GRUB_VIDEO_BACKEND \
-   GRUB_GFXMODE \
-   GRUB_BACKGROUND \
-diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 0f801cab3..1001a1223 100644
---- a/util/grub-mkconfig_lib.in
-+++ b/util/grub-mkconfig_lib.in
-@@ -156,7 +156,7 @@ prepare_grub_to_access_device ()
-   if [ "x$fs_hint" != x ]; then
-     echo "set root='$fs_hint'"
-   fi
--  if fs_uuid="`"${grub_probe}" --device $@ --target=fs_uuid 2> /dev/null`" ; then
-+  if [ "x$GRUB_DISABLE_UUID" != "xtrue" ] && fs_uuid="`"${grub_probe}" --device $@ --target=fs_uuid 2> /dev/null`" ; then
-     hints="`"${grub_probe}" --device $@ --target=hints_string 2> /dev/null`" || hints=
-     echo "if [ x\$feature_platform_search_hint = xy ]; then"
-     echo "  search --no-floppy --fs-uuid --set=root ${hints} ${fs_uuid}"
-@@ -173,7 +173,7 @@ grub_get_device_id ()
-   IFS='
- '
-   device="$1"
--  if fs_uuid="`"${grub_probe}" --device ${device} --target=fs_uuid 2> /dev/null`" ; then
-+  if [ "x$GRUB_DISABLE_UUID" != "xtrue" ] && fs_uuid="`"${grub_probe}" --device ${device} --target=fs_uuid 2> /dev/null`" ; then
-     echo "$fs_uuid";
-   else
-     echo $device |sed 's, ,_,g'

SOURCES/0015-Allow-fallback-to-include-entries-by-title-not-just-.patch

@@ -12,10 +12,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 58 insertions(+), 27 deletions(-)
 
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index e7a83c2d6..d2f64b05e 100644
+index 8397886fa05..d7a222e681b 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
-@@ -163,16 +163,41 @@ grub_menu_set_timeout (int timeout)
+@@ -163,15 +163,40 @@ grub_menu_set_timeout (int timeout)
      }
  }
  
@@ -51,14 +51,13 @@ index e7a83c2d6..d2f64b05e 100644
 -get_and_remove_first_entry_number (const char *name)
 +get_and_remove_first_entry_number (grub_menu_t menu, const char *name)
  {
-   const char *val;
-   char *tail;
+   const char *val, *tail;
    int entry;
 +  int sz = 0;
  
    val = grub_env_get (name);
    if (! val)
-@@ -182,9 +207,39 @@ get_and_remove_first_entry_number (const char *name)
+@@ -181,9 +206,39 @@ get_and_remove_first_entry_number (const char *name)
  
    entry = (int) grub_strtoul (val, &tail, 0);
  
@@ -99,7 +98,7 @@ index e7a83c2d6..d2f64b05e 100644
        while (*tail && grub_isspace (*tail))
  	tail++;
        grub_env_set (name, tail);
-@@ -347,7 +402,7 @@ grub_menu_execute_with_fallback (grub_menu_t menu,
+@@ -346,7 +401,7 @@ grub_menu_execute_with_fallback (grub_menu_t menu,
    grub_menu_execute_entry (entry, 1);
  
    /* Deal with fallback entries.  */
@@ -108,7 +107,7 @@ index e7a83c2d6..d2f64b05e 100644
  	 >= 0)
      {
        grub_print_error ();
-@@ -465,30 +520,6 @@ grub_menu_register_viewer (struct grub_menu_viewer *viewer)
+@@ -464,30 +519,6 @@ grub_menu_register_viewer (struct grub_menu_viewer *viewer)
    viewers = viewer;
  }
  

SOURCES/0016-Make-exit-take-a-return-code.patch

@@ -20,17 +20,17 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  grub-core/kern/mips/arc/init.c       |  2 +-
  grub-core/kern/mips/loongson/init.c  |  2 +-
  grub-core/kern/mips/qemu_mips/init.c |  2 +-
- grub-core/kern/misc.c                |  2 +-
+ grub-core/kern/misc.c                | 11 ++++++++++-
  grub-core/kern/uboot/init.c          |  6 +++---
  grub-core/kern/xen/init.c            |  2 +-
  include/grub/misc.h                  |  2 +-
- 14 files changed, 39 insertions(+), 21 deletions(-)
+ 14 files changed, 48 insertions(+), 21 deletions(-)
 
 diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
-index a3a118241..b25ca4b9f 100644
+index fa498931ed2..2bd3ac76f2d 100644
 --- a/grub-core/commands/minicmd.c
 +++ b/grub-core/commands/minicmd.c
-@@ -176,12 +176,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
+@@ -182,12 +182,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
  }
  
  /* exit */
@@ -60,10 +60,10 @@ index a3a118241..b25ca4b9f 100644
  }
  
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 708581fcb..e339f264b 100644
+index 8cff7be0289..05d8237a9b2 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -164,11 +164,16 @@ grub_reboot (void)
+@@ -165,11 +165,16 @@ grub_reboot (void)
  }
  
  void
@@ -83,7 +83,7 @@ index 708581fcb..e339f264b 100644
  }
  
 diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
-index 425bb9603..55ea5a11c 100644
+index 425bb960347..55ea5a11ccd 100644
 --- a/grub-core/kern/emu/main.c
 +++ b/grub-core/kern/emu/main.c
 @@ -67,7 +67,7 @@ grub_reboot (void)
@@ -96,10 +96,10 @@ index 425bb9603..55ea5a11c 100644
    grub_reboot ();
  }
 diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
-index 76661337f..82012a72f 100644
+index dfd8a8ec488..0ff13bcaf8c 100644
 --- a/grub-core/kern/emu/misc.c
 +++ b/grub-core/kern/emu/misc.c
-@@ -137,9 +137,10 @@ xasprintf (const char *fmt, ...)
+@@ -151,9 +151,10 @@ xasprintf (const char *fmt, ...)
  
  #if !defined (GRUB_MACHINE_EMU) || defined (GRUB_UTIL)
  void
@@ -113,7 +113,7 @@ index 76661337f..82012a72f 100644
  #endif
  
 diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c
-index 3314f027f..36f9134b7 100644
+index 3314f027fec..36f9134b7b7 100644
 --- a/grub-core/kern/i386/coreboot/init.c
 +++ b/grub-core/kern/i386/coreboot/init.c
 @@ -41,7 +41,7 @@ extern grub_uint8_t _end[];
@@ -126,7 +126,7 @@ index 3314f027f..36f9134b7 100644
    /* We can't use grub_fatal() in this function.  This would create an infinite
       loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */
 diff --git a/grub-core/kern/i386/qemu/init.c b/grub-core/kern/i386/qemu/init.c
-index 271b6fbfa..9fafe98f0 100644
+index 271b6fbfabd..9fafe98f015 100644
 --- a/grub-core/kern/i386/qemu/init.c
 +++ b/grub-core/kern/i386/qemu/init.c
 @@ -42,7 +42,7 @@ extern grub_uint8_t _end[];
@@ -139,10 +139,10 @@ index 271b6fbfa..9fafe98f0 100644
    /* We can't use grub_fatal() in this function.  This would create an infinite
       loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */
 diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index 0d8ebf58b..f5423ce27 100644
+index d483e35eed2..e71d1584164 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
-@@ -68,7 +68,7 @@ grub_addr_t grub_ieee1275_original_stack;
+@@ -71,7 +71,7 @@ grub_addr_t grub_ieee1275_original_stack;
  #endif
  
  void
@@ -152,7 +152,7 @@ index 0d8ebf58b..f5423ce27 100644
    grub_ieee1275_exit ();
  }
 diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c
-index 3834a1490..86b3a25ec 100644
+index 2ed3ff3191e..5c40c34078d 100644
 --- a/grub-core/kern/mips/arc/init.c
 +++ b/grub-core/kern/mips/arc/init.c
 @@ -276,7 +276,7 @@ grub_halt (void)
@@ -165,7 +165,7 @@ index 3834a1490..86b3a25ec 100644
    GRUB_ARC_FIRMWARE_VECTOR->exit ();
  
 diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c
-index 7b96531b9..dff598ca7 100644
+index 7b96531b983..dff598ca7b0 100644
 --- a/grub-core/kern/mips/loongson/init.c
 +++ b/grub-core/kern/mips/loongson/init.c
 @@ -304,7 +304,7 @@ grub_halt (void)
@@ -178,7 +178,7 @@ index 7b96531b9..dff598ca7 100644
    grub_halt ();
  }
 diff --git a/grub-core/kern/mips/qemu_mips/init.c b/grub-core/kern/mips/qemu_mips/init.c
-index be88b77d2..8b6c55ffc 100644
+index be88b77d22d..8b6c55ffc01 100644
 --- a/grub-core/kern/mips/qemu_mips/init.c
 +++ b/grub-core/kern/mips/qemu_mips/init.c
 @@ -75,7 +75,7 @@ grub_machine_fini (int flags __attribute__ ((unused)))
@@ -191,10 +191,10 @@ index be88b77d2..8b6c55ffc 100644
    grub_halt ();
  }
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 3b633d51f..952411d5d 100644
+index 3af336ee227..63b586d09cb 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
-@@ -1095,7 +1095,7 @@ grub_abort (void)
+@@ -1209,9 +1209,18 @@ grub_abort (void)
        grub_getkey ();
      }
  
@@ -202,9 +202,20 @@ index 3b633d51f..952411d5d 100644
 +  grub_exit (1);
  }
  
++#if defined (__clang__) && !defined (GRUB_UTIL)
++/* clang emits references to abort().  */
++void __attribute__ ((noreturn))
++abort (void)
++{
++  grub_abort ();
++}
++#endif
++
  void
+ grub_fatal (const char *fmt, ...)
+ {
 diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c
-index 3e338645c..be2a5be1d 100644
+index 3e338645c57..be2a5be1d07 100644
 --- a/grub-core/kern/uboot/init.c
 +++ b/grub-core/kern/uboot/init.c
 @@ -39,9 +39,9 @@ extern grub_size_t grub_total_module_size;
@@ -229,10 +240,10 @@ index 3e338645c..be2a5be1d 100644
    else if (ver > API_SIG_VERSION)
      {
 diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c
-index 0559c033c..fce526d41 100644
+index 782ca72952a..708b060f324 100644
 --- a/grub-core/kern/xen/init.c
 +++ b/grub-core/kern/xen/init.c
-@@ -549,7 +549,7 @@ grub_machine_init (void)
+@@ -584,7 +584,7 @@ grub_machine_init (void)
  }
  
  void
@@ -242,10 +253,10 @@ index 0559c033c..fce526d41 100644
    struct sched_shutdown arg;
  
 diff --git a/include/grub/misc.h b/include/grub/misc.h
-index 372f009e8..83fd69f4a 100644
+index 7d2b5519690..fd18e6320b8 100644
 --- a/include/grub/misc.h
 +++ b/include/grub/misc.h
-@@ -334,7 +334,7 @@ int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt,
+@@ -353,7 +353,7 @@ int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt,
  char *EXPORT_FUNC(grub_xasprintf) (const char *fmt, ...)
       __attribute__ ((format (GNU_PRINTF, 1, 2))) WARN_UNUSED_RESULT;
  char *EXPORT_FUNC(grub_xvasprintf) (const char *fmt, va_list args) WARN_UNUSED_RESULT;

SOURCES/0017-Make-efi-machines-load-an-env-block-from-a-variable.patch

@@ -6,30 +6,38 @@ Subject: [PATCH] Make efi machines load an env block from a variable
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  grub-core/Makefile.core.def |  1 +
- grub-core/kern/efi/init.c   | 34 +++++++++++++++++++++++++++++++++-
- 2 files changed, 34 insertions(+), 1 deletion(-)
+ grub-core/kern/efi/init.c   | 36 +++++++++++++++++++++++++++++++++++-
+ 2 files changed, 36 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index e92a7ef32..f80653882 100644
+index 45d3edaa4dc..c865a08b027 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -191,6 +191,7 @@ kernel = {
-   efi = term/efi/console.c;
-   efi = kern/acpi.c;
+@@ -207,6 +207,7 @@ kernel = {
    efi = kern/efi/acpi.c;
+   efi = kern/efi/sb.c;
+   efi = kern/lockdown.c;
 +  efi = lib/envblk.c;
    i386_coreboot = kern/i386/pc/acpi.c;
    i386_multiboot = kern/i386/pc/acpi.c;
    i386_coreboot = kern/acpi.c;
 diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
-index 3dfdf2d22..71d2279a0 100644
+index 7facacf09c7..6d39bd3ad29 100644
 --- a/grub-core/kern/efi/init.c
 +++ b/grub-core/kern/efi/init.c
-@@ -25,9 +25,40 @@
+@@ -27,8 +27,11 @@
  #include <grub/env.h>
  #include <grub/mm.h>
  #include <grub/kernel.h>
++
+ #include <grub/stack_protector.h>
+ 
 +#include <grub/lib/envblk.h>
++
+ #ifdef GRUB_STACK_PROTECTOR
+ 
+ static grub_efi_guid_t rng_protocol_guid = GRUB_EFI_RNG_PROTOCOL_GUID;
+@@ -82,6 +85,36 @@ stack_protector_init (void)
  
  grub_addr_t grub_modbase;
  
@@ -54,8 +62,8 @@ index 3dfdf2d22..71d2279a0 100644
 +  struct grub_envblk envblk_s = { NULL, 0 };
 +  grub_envblk_t envblk = &envblk_s;
 +
-+  envblk_s.buf = grub_efi_get_variable ("GRUB_ENV", &efi_grub_guid,
-+					&envblk_s.size);
++  grub_efi_get_variable ("GRUB_ENV", &efi_grub_guid, &envblk_s.size,
++                         (void **) &envblk_s.buf);
 +  if (!envblk_s.buf || envblk_s.size < 1)
 +    return;
 +
@@ -66,7 +74,7 @@ index 3dfdf2d22..71d2279a0 100644
  void
  grub_efi_init (void)
  {
-@@ -42,10 +73,11 @@ grub_efi_init (void)
+@@ -108,10 +141,11 @@ grub_efi_init (void)
    efi_call_4 (grub_efi_system_table->boot_services->set_watchdog_timer,
  	      0, 0, 0, NULL);
  

SOURCES/0017-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Wed, 22 Jul 2015 11:21:01 -0400
-Subject: [PATCH] Mark po/exclude.pot as binary so git won't try to diff
- nonprintables.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- .gitattributes | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 .gitattributes
-
-diff --git a/.gitattributes b/.gitattributes
-new file mode 100644
-index 000000000..33ffaa404
---- /dev/null
-+++ b/.gitattributes
-@@ -0,0 +1 @@
-+po/exclude.pot binary

SOURCES/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch

@@ -12,10 +12,10 @@ maximum screen size so that text is not overwritten.
  create mode 100644 util/grub.d/20_ppc_terminfo.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 3180ac880..c7b775bce 100644
+index f8b356cc1fa..2c9b283a230 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -487,6 +487,13 @@ script = {
+@@ -508,6 +508,13 @@ script = {
    condition = COND_HOST_LINUX;
  };
  
@@ -31,7 +31,7 @@ index 3180ac880..c7b775bce 100644
    common = util/grub.d/30_os-prober.in;
 diff --git a/util/grub.d/20_ppc_terminfo.in b/util/grub.d/20_ppc_terminfo.in
 new file mode 100644
-index 000000000..10d665868
+index 00000000000..10d66586820
 --- /dev/null
 +++ b/util/grub.d/20_ppc_terminfo.in
 @@ -0,0 +1,114 @@

SOURCES/0019-Add-fw_path-variable-revised.patch

@@ -14,10 +14,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=857936
  2 files changed, 30 insertions(+), 8 deletions(-)
 
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 9cad0c448..8ab7794c4 100644
+index 73967e2f5b0..d1de9fa6873 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
-@@ -127,16 +127,15 @@ grub_set_prefix_and_root (void)
+@@ -128,16 +128,15 @@ grub_set_prefix_and_root (void)
  
    grub_machine_get_bootlocation (&fwdevice, &fwpath);
  
@@ -41,10 +41,10 @@ index 9cad0c448..8ab7794c4 100644
      }
  
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 249e19bc7..759c475c4 100644
+index 70614de1565..62571e6dfcc 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -338,7 +338,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
+@@ -339,7 +339,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
        /* Guess the config filename. It is necessary to make CONFIG static,
  	 so that it won't get broken by longjmp.  */
        char *config;
@@ -59,7 +59,7 @@ index 249e19bc7..759c475c4 100644
 +	    {
 +	      grub_file_t file;
 +
-+	      file = grub_file_open (config);
++	      file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
 +	      if (file)
 +		{
 +		  grub_file_close (file);

SOURCES/0019-DHCP-client-ID-and-UUID-options-added.patch

@@ -1,142 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
-Date: Tue, 27 Nov 2012 17:18:53 -0200
-Subject: [PATCH] DHCP client ID and UUID options added.
-
----
- grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----
- include/grub/net.h    |  2 ++
- 2 files changed, 81 insertions(+), 8 deletions(-)
-
-diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 9e2fdb795..f03eeab2f 100644
---- a/grub-core/net/bootp.c
-+++ b/grub-core/net/bootp.c
-@@ -25,6 +25,49 @@
- #include <grub/net/udp.h>
- #include <grub/datetime.h>
- 
-+static char *
-+grub_env_write_readonly (struct grub_env_var *var __attribute__ ((unused)),
-+			 const char *val __attribute__ ((unused)))
-+{
-+  return NULL;
-+}
-+
-+static void
-+set_env_limn_ro (const char *intername, const char *suffix,
-+		 const char *value, grub_size_t len)
-+{
-+  char *varname, *varvalue;
-+  char *ptr;
-+  varname = grub_xasprintf ("net_%s_%s", intername, suffix);
-+  if (!varname)
-+    return;
-+  for (ptr = varname; *ptr; ptr++)
-+    if (*ptr == ':')
-+      *ptr = '_';
-+  varvalue = grub_malloc (len + 1);
-+  if (!varvalue)
-+    {
-+      grub_free (varname);
-+      return;
-+    }
-+
-+  grub_memcpy (varvalue, value, len);
-+  varvalue[len] = 0;
-+  grub_env_set (varname, varvalue);
-+  grub_register_variable_hook (varname, 0, grub_env_write_readonly);
-+  grub_env_export (varname);
-+  grub_free (varname);
-+  grub_free (varvalue);
-+}
-+
-+static char
-+hexdigit (grub_uint8_t val)
-+{
-+  if (val < 10)
-+    return val + '0';
-+  return val + 'a' - 10;
-+}
-+
- static void
- parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask)
- {
-@@ -55,6 +98,9 @@ parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask)
- 
-       taglength = *ptr++;
- 
-+      grub_dprintf("net", "DHCP option %u (0x%02x) found with length %u.\n",
-+                   tagtype, tagtype, taglength);
-+
-       switch (tagtype)
- 	{
- 	case GRUB_NET_BOOTP_NETMASK:
-@@ -120,6 +166,39 @@ parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask)
-                                      taglength);
-           break;
- 
-+        case GRUB_NET_BOOTP_CLIENT_ID:
-+	  set_env_limn_ro (name, "clientid", (char *) ptr, taglength);
-+          break;
-+
-+        case GRUB_NET_BOOTP_CLIENT_UUID:
-+            {
-+              if (taglength != 17)
-+                break;
-+
-+              /* The format is 9cfe245e-d0c8-bd45-a79f-54ea5fbd3d97 */
-+
-+              ptr += 1;
-+              taglength -= 1;
-+
-+              char *val = grub_malloc (2 * taglength + 4 + 1);
-+              int i = 0;
-+              int j = 0;
-+              for (i = 0; i < taglength; i++)
-+                {
-+                  val[2 * i + j] = hexdigit (ptr[i] >> 4);
-+                  val[2 * i + 1 + j] = hexdigit (ptr[i] & 0xf);
-+
-+                  if ((i == 3) || (i == 5) || (i == 7) || (i == 9))
-+                    {
-+                      j++;
-+                      val[2 * i + 1+ j] = '-';
-+                    }
-+                }
-+
-+              set_env_limn_ro (name, "clientuuid", (char *) val, 2 * taglength + 4);
-+            }
-+          break;
-+
- 	  /* If you need any other options please contact GRUB
- 	     development team.  */
- 	}
-@@ -302,14 +381,6 @@ grub_net_process_dhcp (struct grub_net_buff *nb,
-     }
- }
- 
--static char
--hexdigit (grub_uint8_t val)
--{
--  if (val < 10)
--    return val + '0';
--  return val + 'a' - 10;
--}
--
- static grub_err_t
- grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)),
- 		  int argc, char **args)
-diff --git a/include/grub/net.h b/include/grub/net.h
-index 1096b2432..e266bae23 100644
---- a/include/grub/net.h
-+++ b/include/grub/net.h
-@@ -457,6 +457,8 @@ enum
-     GRUB_NET_BOOTP_DOMAIN = 0x0f,
-     GRUB_NET_BOOTP_ROOT_PATH = 0x11,
-     GRUB_NET_BOOTP_EXTENSIONS_PATH = 0x12,
-+    GRUB_NET_BOOTP_CLIENT_ID = 0x3d,
-+    GRUB_NET_BOOTP_CLIENT_UUID = 0x61,
-     GRUB_NET_BOOTP_END = 0xff
-   };
- 

SOURCES/0020-Pass-x-hex-hex-straight-through-unmolested.patch

@@ -3,17 +3,20 @@ From: Peter Jones <pjones@redhat.com>
 Date: Mon, 1 Oct 2012 13:24:37 -0400
 Subject: [PATCH] Pass "\x[[:hex:]][[:hex:]]" straight through unmolested.
 
+Don't munge raw spaces when we're doing our cmdline escaping (#923374)
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  grub-core/commands/wildcard.c | 16 +++++++++++++++-
- grub-core/lib/cmdline.c       | 34 ++++++++++++++++++++++++++++++++--
+ grub-core/lib/cmdline.c       | 25 +++++++++++++++++++++++--
  grub-core/script/execute.c    | 43 +++++++++++++++++++++++++++++++++++++------
- 3 files changed, 84 insertions(+), 9 deletions(-)
+ 3 files changed, 75 insertions(+), 9 deletions(-)
 
 diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
-index 9b4e72766..02c46f9fd 100644
+index cc3290311f0..8f67a4be7f0 100644
 --- a/grub-core/commands/wildcard.c
 +++ b/grub-core/commands/wildcard.c
-@@ -462,6 +462,12 @@ check_file (const char *dir, const char *basename)
+@@ -488,6 +488,12 @@ check_file (const char *dir, const char *basename)
    return ctx.found;
  }
  
@@ -26,7 +29,7 @@ index 9b4e72766..02c46f9fd 100644
  static void
  unescape (char *out, const char *in, const char *end)
  {
-@@ -470,7 +476,15 @@ unescape (char *out, const char *in, const char *end)
+@@ -496,7 +502,15 @@ unescape (char *out, const char *in, const char *end)
  
    for (optr = out, iptr = in; iptr < end;)
      {
@@ -44,7 +47,7 @@ index 9b4e72766..02c46f9fd 100644
  	  *optr++ = iptr[1];
  	  iptr += 2;
 diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
-index d5e10ee87..0a5b2afb9 100644
+index ed0b149dca5..8e2294d8ff6 100644
 --- a/grub-core/lib/cmdline.c
 +++ b/grub-core/lib/cmdline.c
 @@ -20,6 +20,12 @@
@@ -75,21 +78,12 @@ index d5e10ee87..0a5b2afb9 100644
  	size++;
        else if (*c == ' ')
  	space = 1;
-@@ -85,7 +97,25 @@ int grub_create_loader_cmdline (int argc, char *argv[], char *buf,
+@@ -86,7 +98,16 @@ grub_create_loader_cmdline (int argc, char *argv[], char *buf,
  
        while (*c)
  	{
 -	  if (*c == '\\' || *c == '\'' || *c == '"')
-+	  if (*c == ' ')
-+	    {
-+	      *buf++ = '\\';
-+	      *buf++ = 'x';
-+	      *buf++ = '2';
-+	      *buf++ = '0';
-+	      c++;
-+	      continue;
-+	    }
-+	  else if (*c == '\\' && *(c+1) == 'x' &&
++	  if (*c == '\\' && *(c+1) == 'x' &&
 +		   is_hex(*(c+2)) && is_hex(*(c+3)))
 +	    {
 +	      *buf++ = *c++;
@@ -103,10 +97,10 @@ index d5e10ee87..0a5b2afb9 100644
  
  	  *buf++ = *c;
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index ab78ca87f..cf6cd6601 100644
+index ad80399246a..0c6dd9c5201 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
-@@ -55,6 +55,12 @@ static struct grub_script_scope *scope = 0;
+@@ -56,6 +56,12 @@ static struct grub_script_scope *scope = 0;
  /* Wildcard translator for GRUB script.  */
  struct grub_script_wildcard_translator *grub_wildcard_translator;
  
@@ -119,7 +113,7 @@ index ab78ca87f..cf6cd6601 100644
  static char*
  wildcard_escape (const char *s)
  {
-@@ -71,7 +77,15 @@ wildcard_escape (const char *s)
+@@ -72,7 +78,15 @@ wildcard_escape (const char *s)
    i = 0;
    while ((ch = *s++))
      {
@@ -136,7 +130,7 @@ index ab78ca87f..cf6cd6601 100644
  	p[i++] = '\\';
        p[i++] = ch;
      }
-@@ -95,7 +109,14 @@ wildcard_unescape (const char *s)
+@@ -96,7 +110,14 @@ wildcard_unescape (const char *s)
    i = 0;
    while ((ch = *s++))
      {
@@ -152,7 +146,7 @@ index ab78ca87f..cf6cd6601 100644
  	p[i++] = *s++;
        else
  	p[i++] = ch;
-@@ -397,10 +418,20 @@ parse_string (const char *str,
+@@ -398,10 +419,20 @@ parse_string (const char *str,
      switch (*ptr)
        {
        case '\\':

SOURCES/0020-trim-arp-packets-with-abnormal-size.patch

@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
-Date: Wed, 5 Feb 2014 09:42:42 -0200
-Subject: [PATCH] trim arp packets with abnormal size
-
-GRUB uses arp request to create the arp response. If the incoming packet
-is foobared, GRUB needs to trim the arp response packet before sending it.
----
- grub-core/net/arp.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
-index 54306e3b1..d1c69ed2b 100644
---- a/grub-core/net/arp.c
-+++ b/grub-core/net/arp.c
-@@ -150,6 +150,12 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
-     if (grub_net_addr_cmp (&inf->address, &target_addr) == 0
- 	&& arp_packet->op == grub_cpu_to_be16_compile_time (ARP_REQUEST))
-       {
-+        if ((nb->tail - nb->data) > 50)
-+          {
-+            grub_dprintf ("net", "arp packet with abnormal size (%ld bytes).\n",
-+                         nb->tail - nb->data);
-+            nb->tail = nb->data + 50;
-+          }
- 	grub_net_link_level_address_t target;
- 	struct grub_net_buff nb_reply;
- 	struct arppkt *arp_reply;

SOURCES/0021-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch

@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Prarit Bhargava <prarit@redhat.com>
-Date: Wed, 12 Mar 2014 10:58:16 -0400
-Subject: [PATCH] Fix bad test on GRUB_DISABLE_SUBMENU.
-
-The file /etc/grub.d/10_linux does
-
-if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
-
-when it should do
-
-if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
-
-which results in submenus in /boot/grub2/grub.cfg when
-GRUB_DISABLE_SUBMENU="yes".
-
-Resolves: rhbz#1063414
----
- util/grub.d/10_linux.in | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 61ebd7dc7..87a7da349 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -261,7 +261,11 @@ while [ "x$list" != "x" ] ; do
-     fi
-   fi
- 
--  if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
-+  if [ "x${GRUB_DISABLE_SUBMENU}" = "xyes" ] || [ "x${GRUB_DISABLE_SUBMENU}" = "xy" ]; then
-+    GRUB_DISABLE_SUBMENU="true"
-+  fi
-+
-+  if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
-     linux_entry "${OS}" "${version}" simple \
-     "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
- 

SOURCES/0022-Add-devicetree-loading.patch

@@ -20,10 +20,10 @@ Signed-off-by: David A. Marlin <dmarlin@redhat.com>
  2 files changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index b0a8626dd..f68d4925e 100644
+index d3e879b8e5c..8ea2315ebc2 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -254,7 +254,8 @@ export GRUB_DEFAULT \
+@@ -248,7 +248,8 @@ export GRUB_DEFAULT \
    GRUB_ENABLE_CRYPTODISK \
    GRUB_BADRAM \
    GRUB_OS_PROBER_SKIP_LIST \
@@ -34,7 +34,7 @@ index b0a8626dd..f68d4925e 100644
  if test "x${grub_cfg}" != "x"; then
    rm -f "${grub_cfg}.new"
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 87a7da349..233754ff2 100644
+index e8b01c0d0c7..dc75a1c30bf 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -153,6 +153,13 @@ EOF

SOURCES/0022-Add-support-for-UEFI-operating-systems-returned-by-o.patch

@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Matthew Garrett <matthew.garrett@nebula.com>
-Date: Wed, 12 Jun 2013 11:51:49 -0400
-Subject: [PATCH] Add support for UEFI operating systems returned by os-prober
-
-os-prober returns UEFI operating systems in the form:
-
-path:long-name:name
-
-where path is the path under the EFI directory on the ESP. This is in
-contrast to legacy OSes, where path is the device string. Handle this case.
----
- util/grub.d/30_os-prober.in | 21 ++++++++++++++++++---
- 1 file changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 515a68c7a..9b8f5968e 100644
---- a/util/grub.d/30_os-prober.in
-+++ b/util/grub.d/30_os-prober.in
-@@ -328,8 +328,23 @@ EOF
- EOF
-     ;;
-     *)
--      # TRANSLATORS: %s is replaced by OS name.
--      gettext_printf "%s is not yet supported by grub-mkconfig.\n" "  ${LONGNAME}" >&2
--    ;;
-+      case ${DEVICE} in
-+	*.efi)
-+	  cat << EOF
-+menuentry '$(echo "${LONGNAME}" | grub_quote)' {
-+EOF
-+	  save_default_entry | grub_add_tab
-+	  cat << EOF
-+	  chainloader /EFI/${DEVICE}
-+	  boot
-+}
-+EOF
-+	  ;;
-+	*)
-+          echo -n "  "
-+          # TRANSLATORS: %s is replaced by OS name.
-+          gettext_printf "%s is not yet supported by grub-mkconfig.\n" "${LONGNAME}" >&2
-+        ;;
-+      esac
-   esac
- done

SOURCES/0023-Don-t-write-messages-to-the-screen.patch

@@ -15,7 +15,7 @@ very appealing.
  5 files changed, 5 insertions(+), 40 deletions(-)
 
 diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
-index 4880cefe3..b22e1bcc9 100644
+index 4d02e62c109..84d520cd494 100644
 --- a/grub-core/gettext/gettext.c
 +++ b/grub-core/gettext/gettext.c
 @@ -434,16 +434,12 @@ static char *
@@ -97,10 +97,10 @@ index 4880cefe3..b22e1bcc9 100644
    grub_register_variable_hook ("locale_dir", NULL, read_main);
    grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary);
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 8ab7794c4..da47b18b5 100644
+index d1de9fa6873..48058d983ce 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
-@@ -268,11 +268,6 @@ grub_main (void)
+@@ -269,11 +269,6 @@ grub_main (void)
  
    grub_boot_time ("After machine init.");
  
@@ -109,11 +109,11 @@ index 8ab7794c4..da47b18b5 100644
 -  grub_printf ("Welcome to GRUB!\n\n");
 -  grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
 -
-   grub_load_config ();
+   /* Init verifiers API. */
+   grub_verifiers_init ();
  
-   grub_boot_time ("Before loading embedded modules.");
 diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
-index 2bd0b2d28..ea167fe12 100644
+index 2bd0b2d2866..ea167fe1206 100644
 --- a/grub-core/boot/i386/pc/boot.S
 +++ b/grub-core/boot/i386/pc/boot.S
 @@ -249,9 +249,6 @@ real_start:
@@ -127,7 +127,7 @@ index 2bd0b2d28..ea167fe12 100644
  	movw	$disk_address_packet, %si
  
 diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
-index c1addc0df..68d31de0c 100644
+index c1addc0df29..68d31de0c4c 100644
 --- a/grub-core/boot/i386/pc/diskboot.S
 +++ b/grub-core/boot/i386/pc/diskboot.S
 @@ -50,11 +50,6 @@ _start:
@@ -143,7 +143,7 @@ index c1addc0df..68d31de0c 100644
  	movw	$LOCAL(firstlist), %di
  
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 233754ff2..3a5aa0f8d 100644
+index dc75a1c30bf..ad2ac4b078d 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -138,27 +138,20 @@ linux_entry ()

SOURCES/0024-Don-t-print-GNU-GRUB-header.patch

@@ -9,10 +9,10 @@ No one cares.
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index b2654ef62..f57b7508a 100644
+index 7ca2e5400b1..5d5f7b539f5 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -202,15 +202,16 @@ read_config_file (const char *config)
+@@ -208,15 +208,16 @@ read_config_file (const char *config)
  /* Initialize the screen.  */
  void
  grub_normal_init_page (struct grub_term_output *term,
@@ -32,7 +32,7 @@ index b2654ef62..f57b7508a 100644
  
    msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
    if (!msg_formatted)
-@@ -235,6 +236,7 @@ grub_normal_init_page (struct grub_term_output *term,
+@@ -241,6 +242,7 @@ grub_normal_init_page (struct grub_term_output *term,
    grub_putcode ('\n', term);
    grub_putcode ('\n', term);
    grub_free (unicode_msg);

SOURCES/0025-Don-t-add-to-highlighted-row.patch

@@ -9,7 +9,7 @@ It is already highlighted.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index e22bb91f6..a3d1f23f6 100644
+index 18240e76cea..65deafda531 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -242,7 +242,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,

SOURCES/0026-Add-X-option-to-printf-functions.patch

@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
-Date: Tue, 27 Nov 2012 16:58:39 -0200
-Subject: [PATCH] Add %X option to printf functions.
-
----
- grub-core/kern/misc.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 952411d5d..8344526be 100644
---- a/grub-core/kern/misc.c
-+++ b/grub-core/kern/misc.c
-@@ -588,7 +588,7 @@ grub_divmod64 (grub_uint64_t n, grub_uint64_t d, grub_uint64_t *r)
- static inline char *
- grub_lltoa (char *str, int c, unsigned long long n)
- {
--  unsigned base = (c == 'x') ? 16 : 10;
-+  unsigned base = ((c == 'x') || (c == 'X')) ? 16 : 10;
-   char *p;
- 
-   if ((long long) n < 0 && c == 'd')
-@@ -603,7 +603,7 @@ grub_lltoa (char *str, int c, unsigned long long n)
-     do
-       {
- 	unsigned d = (unsigned) (n & 0xf);
--	*p++ = (d > 9) ? d + 'a' - 10 : d + '0';
-+	*p++ = (d > 9) ? d + ((c == 'x') ? 'a' : 'A') - 10 : d + '0';
-       }
-     while (n >>= 4);
-   else
-@@ -676,6 +676,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args,
- 	{
- 	case 'p':
- 	case 'x':
-+	case 'X':
- 	case 'u':
- 	case 'd':
- 	case 'c':
-@@ -762,6 +763,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args,
-       switch (c)
- 	{
- 	case 'x':
-+	case 'X':
- 	case 'u':
- 	  args->ptr[curn].type = UNSIGNED_INT + longfmt;
- 	  break;
-@@ -900,6 +902,7 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0,
- 	  c = 'x';
- 	  /* Fall through. */
- 	case 'x':
-+	case 'X':
- 	case 'u':
- 	case 'd':
- 	  {

SOURCES/0026-Message-string-cleanups.patch

@@ -9,7 +9,7 @@ Make use of terminology consistent. Remove jargon.
  1 file changed, 9 insertions(+), 12 deletions(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index a3d1f23f6..64a83862f 100644
+index 65deafda531..cc5837ed2b8 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -157,9 +157,8 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)

SOURCES/0027-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] Fix border spacing now that we aren't displaying it
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 64a83862f..1062d64ee 100644
+index cc5837ed2b8..b49835a9af7 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -331,12 +331,12 @@ grub_menu_init_page (int nested, int edit,

SOURCES/0027-Search-for-specific-config-file-for-netboot.patch

@@ -1,200 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
-Date: Tue, 27 Nov 2012 17:22:07 -0200
-Subject: [PATCH] Search for specific config file for netboot
-
-This patch implements a search for a specific configuration when the config
-file is on a remoteserver. It uses the following order:
-   1) DHCP client UUID option.
-   2) MAC address (in lower case hexadecimal with dash separators);
-   3) IP (in upper case hexadecimal) or IPv6;
-   4) The original grub.cfg file.
-
-This procedure is similar to what is used by pxelinux and yaboot:
-http://www.syslinux.org/wiki/index.php/PXELINUX#config
-
-This should close the bugzilla:
-https://bugzilla.redhat.com/show_bug.cgi?id=873406
----
- grub-core/net/net.c     | 118 ++++++++++++++++++++++++++++++++++++++++++++++++
- grub-core/normal/main.c |  18 ++++++--
- include/grub/net.h      |   3 ++
- 3 files changed, 135 insertions(+), 4 deletions(-)
-
-diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 10773fc34..0769bf850 100644
---- a/grub-core/net/net.c
-+++ b/grub-core/net/net.c
-@@ -1735,6 +1735,124 @@ grub_net_restore_hw (void)
-   return GRUB_ERR_NONE;
- }
- 
-+grub_err_t
-+grub_net_search_configfile (char *config)
-+{
-+  grub_size_t config_len;
-+  char *suffix;
-+
-+  auto int search_through (grub_size_t num_tries, grub_size_t slice_size);
-+  int search_through (grub_size_t num_tries, grub_size_t slice_size)
-+    {
-+      while (num_tries-- > 0)
-+        {
-+	  grub_dprintf ("net", "probe %s\n", config);
-+
-+          grub_file_t file;
-+          file = grub_file_open (config);
-+
-+          if (file)
-+            {
-+              grub_file_close (file);
-+              grub_dprintf ("net", "found!\n");
-+              return 0;
-+            }
-+          else
-+            {
-+              if (grub_errno == GRUB_ERR_IO)
-+                grub_errno = GRUB_ERR_NONE;
-+            }
-+
-+          if (grub_strlen (suffix) < slice_size)
-+            break;
-+
-+          config[grub_strlen (config) - slice_size] = '\0';
-+        }
-+
-+      return 1;
-+    }
-+
-+  config_len = grub_strlen (config);
-+  config[config_len] = '-';
-+  suffix = config + config_len + 1;
-+
-+  struct grub_net_network_level_interface *inf;
-+  FOR_NET_NETWORK_LEVEL_INTERFACES (inf)
-+    {
-+      /* By the Client UUID. */
-+
-+      char client_uuid_var[sizeof ("net_") + grub_strlen (inf->name) +
-+                           sizeof ("_clientuuid") + 1];
-+      grub_snprintf (client_uuid_var, sizeof (client_uuid_var),
-+                     "net_%s_clientuuid", inf->name);
-+
-+      const char *client_uuid;
-+      client_uuid = grub_env_get (client_uuid_var);
-+
-+      if (client_uuid)
-+        {
-+          grub_strcpy (suffix, client_uuid);
-+          if (search_through (1, 0) == 0) return GRUB_ERR_NONE;
-+        }
-+
-+      /* By the MAC address. */
-+
-+      /* Add ethernet type */
-+      grub_strcpy (suffix, "01-");
-+
-+      grub_net_hwaddr_to_str (&inf->hwaddress, suffix + 3);
-+
-+      char *ptr;
-+      for (ptr = suffix; *ptr; ptr++)
-+        if (*ptr == ':')
-+          *ptr = '-';
-+
-+      if (search_through (1, 0) == 0) return GRUB_ERR_NONE;
-+
-+      /* By IP address */
-+
-+      switch ((&inf->address)->type)
-+        {
-+        case GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4:
-+            {
-+              grub_uint32_t n = grub_be_to_cpu32 ((&inf->address)->ipv4);
-+              grub_snprintf (suffix, GRUB_NET_MAX_STR_ADDR_LEN, "%02X%02X%02X%02X", \
-+                             ((n >> 24) & 0xff), ((n >> 16) & 0xff), \
-+                             ((n >> 8) & 0xff), ((n >> 0) & 0xff));
-+
-+              if (search_through (8, 1) == 0) return GRUB_ERR_NONE;
-+              break;
-+            }
-+        case GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV6:
-+            {
-+              char buf[GRUB_NET_MAX_STR_ADDR_LEN];
-+              struct grub_net_network_level_address base;
-+              base.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV6;
-+              grub_memcpy (&base.ipv6, ((&inf->address)->ipv6), 16);
-+              grub_net_addr_to_str (&base, buf);
-+
-+              for (ptr = buf; *ptr; ptr++)
-+                if (*ptr == ':')
-+                  *ptr = '-';
-+
-+              grub_snprintf (suffix, GRUB_NET_MAX_STR_ADDR_LEN, "%s", buf);
-+              if (search_through (1, 0) == 0) return GRUB_ERR_NONE;
-+              break;
-+            }
-+        case GRUB_NET_NETWORK_LEVEL_PROTOCOL_DHCP_RECV:
-+          return grub_error (GRUB_ERR_BUG, "shouldn't reach here");
-+        default:
-+          return grub_error (GRUB_ERR_BUG,
-+                             "unsupported address type %d", (&inf->address)->type);
-+        }
-+    }
-+
-+  /* Remove the remaining minus sign at the end. */
-+  config[config_len] = '\0';
-+
-+  return GRUB_ERR_NONE;
-+}
-+
- static struct grub_preboot *fini_hnd;
- 
- static grub_command_t cmd_addaddr, cmd_deladdr, cmd_addroute, cmd_delroute;
-diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 759c475c4..b2654ef62 100644
---- a/grub-core/normal/main.c
-+++ b/grub-core/normal/main.c
-@@ -33,6 +33,7 @@
- #include <grub/charset.h>
- #include <grub/script_sh.h>
- #include <grub/bufio.h>
-+#include <grub/net.h>
- #ifdef GRUB_MACHINE_IEEE1275
- #include <grub/ieee1275/ieee1275.h>
- #endif
-@@ -365,10 +366,19 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
- 
-       prefix = grub_env_get ("prefix");
-       if (prefix)
--	{
--	  config = grub_xasprintf ("%s/grub.cfg", prefix);
--	  if (! config)
--	    goto quit;
-+        {
-+          grub_size_t config_len;
-+          config_len = grub_strlen (prefix) +
-+                      sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
-+          config = grub_malloc (config_len);
-+
-+          if (! config)
-+            goto quit;
-+
-+          grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
-+
-+          if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0)
-+            grub_net_search_configfile (config);
- 
- 	  grub_enter_normal_mode (config);
- 	  grub_free (config);
-diff --git a/include/grub/net.h b/include/grub/net.h
-index e266bae23..50d62ab0c 100644
---- a/include/grub/net.h
-+++ b/include/grub/net.h
-@@ -566,4 +566,7 @@ extern char *grub_net_default_server;
- 
- #define VLANTAG_IDENTIFIER 0x8100
- 
-+grub_err_t
-+grub_net_search_configfile (char *config);
-+
- #endif /* ! GRUB_NET_HEADER */

SOURCES/0028-Use-the-correct-indentation-for-the-term-help-text.patch

@@ -9,10 +9,10 @@ That is consistent with the menu help text
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index f57b7508a..0ce59fdc3 100644
+index 5d5f7b539f5..ec1cd257397 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -426,8 +426,8 @@ grub_normal_reader_init (int nested)
+@@ -440,8 +440,8 @@ grub_normal_reader_init (int nested)
      grub_normal_init_page (term, 1);
      grub_term_setcursor (term, 1);
  

SOURCES/0028-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch

@@ -1,248 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fedora Ninjas <grub2-owner@fedoraproject.org>
-Date: Tue, 22 Jan 2013 06:31:38 +0100
-Subject: [PATCH] blscfg: add blscfg module to parse Boot Loader Specification
- snippets
-
-http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec
-
-Works like this:
-
- insmod blscfg
- bls_import
-
-Done! You should now have menu items for your snippets in place.
-
-Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
----
- grub-core/Makefile.core.def |   8 ++
- grub-core/commands/blscfg.c | 201 ++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 209 insertions(+)
- create mode 100644 grub-core/commands/blscfg.c
-
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index f80653882..cd0902b46 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -768,6 +768,14 @@ module = {
-   common = commands/blocklist.c;
- };
- 
-+module = {
-+  name = blscfg;
-+  common = commands/blscfg.c;
-+  enable = i386_efi;
-+  enable = x86_64_efi;
-+  enable = i386_pc;
-+};
-+
- module = {
-   name = boot;
-   common = commands/boot.c;
-diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-new file mode 100644
-index 000000000..4274aca5a
---- /dev/null
-+++ b/grub-core/commands/blscfg.c
-@@ -0,0 +1,201 @@
-+/*-*- Mode: C; c-basic-offset: 2; indent-tabs-mode: t -*-*/
-+
-+/* bls.c - implementation of the boot loader spec */
-+
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *
-+ *  GRUB is free software: you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation, either version 3 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  GRUB is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <grub/types.h>
-+#include <grub/misc.h>
-+#include <grub/mm.h>
-+#include <grub/err.h>
-+#include <grub/dl.h>
-+#include <grub/extcmd.h>
-+#include <grub/i18n.h>
-+#include <grub/fs.h>
-+#include <grub/env.h>
-+#include <grub/file.h>
-+#include <grub/normal.h>
-+
-+GRUB_MOD_LICENSE ("GPLv3+");
-+
-+#ifdef GRUB_MACHINE_EFI
-+#define GRUB_LINUX_CMD "linuxefi"
-+#define GRUB_INITRD_CMD "initrdefi"
-+#define GRUB_BLS_CONFIG_PATH "/EFI/fedora/loader/entries/"
-+#define GRUB_BOOT_DEVICE "($boot)"
-+#else
-+#define GRUB_LINUX_CMD "linux"
-+#define GRUB_INITRD_CMD "initrd"
-+#define GRUB_BLS_CONFIG_PATH "/loader/entries/"
-+#define GRUB_BOOT_DEVICE "($root)"
-+#endif
-+
-+static int parse_entry (
-+    const char *filename,
-+    const struct grub_dirhook_info *info __attribute__ ((unused)),
-+    void *data __attribute__ ((unused)))
-+{
-+  grub_size_t n;
-+  char *p;
-+  grub_file_t f = NULL;
-+  grub_off_t sz;
-+  char *title = NULL, *options = NULL, *clinux = NULL, *initrd = NULL, *src = NULL;
-+  const char *args[2] = { NULL, NULL };
-+
-+  if (filename[0] == '.')
-+    return 0;
-+
-+  n = grub_strlen (filename);
-+  if (n <= 5)
-+    return 0;
-+
-+  if (grub_strcmp (filename + n - 5, ".conf") != 0)
-+    return 0;
-+
-+  p = grub_xasprintf (GRUB_BLS_CONFIG_PATH "%s", filename);
-+
-+  f = grub_file_open (p);
-+  if (!f)
-+    goto finish;
-+
-+  sz = grub_file_size (f);
-+  if (sz == GRUB_FILE_SIZE_UNKNOWN || sz > 1024*1024)
-+    goto finish;
-+
-+  for (;;)
-+    {
-+      char *buf;
-+
-+      buf = grub_file_getline (f);
-+      if (!buf)
-+	break;
-+
-+      if (grub_strncmp (buf, "title ", 6) == 0)
-+	{
-+	  grub_free (title);
-+	  title = grub_strdup (buf + 6);
-+	  if (!title)
-+	    goto finish;
-+	}
-+      else if (grub_strncmp (buf, "options ", 8) == 0)
-+	{
-+	  grub_free (options);
-+	  options = grub_strdup (buf + 8);
-+	  if (!options)
-+	    goto finish;
-+	}
-+      else if (grub_strncmp (buf, "linux ", 6) == 0)
-+	{
-+	  grub_free (clinux);
-+	  clinux = grub_strdup (buf + 6);
-+	  if (!clinux)
-+	    goto finish;
-+	}
-+      else if (grub_strncmp (buf, "initrd ", 7) == 0)
-+	{
-+	  grub_free (initrd);
-+	  initrd = grub_strdup (buf + 7);
-+	  if (!initrd)
-+	    goto finish;
-+	}
-+
-+      grub_free(buf);
-+    }
-+
-+  if (!linux)
-+    {
-+      grub_printf ("Skipping file %s with no 'linux' key.", p);
-+      goto finish;
-+    }
-+
-+  args[0] = title ? title : filename;
-+
-+  src = grub_xasprintf ("load_video\n"
-+			"set gfx_payload=keep\n"
-+			"insmod gzio\n"
-+			GRUB_LINUX_CMD " %s%s%s%s\n"
-+			"%s%s%s%s",
-+			GRUB_BOOT_DEVICE, clinux, options ? " " : "", options ? options : "",
-+			initrd ? GRUB_INITRD_CMD " " : "", initrd ? GRUB_BOOT_DEVICE : "", initrd ? initrd : "", initrd ? "\n" : "");
-+
-+  grub_normal_add_menu_entry (1, args, NULL, NULL, "bls", NULL, NULL, src, 0);
-+
-+finish:
-+  grub_free (p);
-+  grub_free (title);
-+  grub_free (options);
-+  grub_free (clinux);
-+  grub_free (initrd);
-+  grub_free (src);
-+
-+  if (f)
-+    grub_file_close (f);
-+
-+  return 0;
-+}
-+
-+static grub_err_t
-+grub_cmd_bls_import (grub_extcmd_context_t ctxt __attribute__ ((unused)),
-+		     int argc __attribute__ ((unused)),
-+		     char **args __attribute__ ((unused)))
-+{
-+  grub_fs_t fs;
-+  grub_device_t dev;
-+  static grub_err_t r;
-+  const char *devid;
-+
-+  devid = grub_env_get ("root");
-+  if (!devid)
-+    return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("variable `%s' isn't set"), "root");
-+
-+  dev = grub_device_open (devid);
-+  if (!dev)
-+    return grub_errno;
-+
-+  fs = grub_fs_probe (dev);
-+  if (!fs)
-+    {
-+      r = grub_errno;
-+      goto finish;
-+    }
-+
-+  r = fs->dir (dev, GRUB_BLS_CONFIG_PATH, parse_entry, NULL);
-+
-+finish:
-+  if (dev)
-+    grub_device_close (dev);
-+
-+  return r;
-+}
-+
-+static grub_extcmd_t cmd;
-+
-+GRUB_MOD_INIT(bls)
-+{
-+  cmd = grub_register_extcmd ("bls_import",
-+			      grub_cmd_bls_import,
-+			      0,
-+			      NULL,
-+			      N_("Import Boot Loader Specification snippets."),
-+			      NULL);
-+}
-+
-+GRUB_MOD_FINI(bls)
-+{
-+  grub_unregister_extcmd (cmd);
-+}

SOURCES/0029-Indent-menu-entries.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] Indent menu entries
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 1062d64ee..ecc60f99f 100644
+index b49835a9af7..6a57376fa80 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -239,7 +239,8 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,

SOURCES/0030-Fix-margins.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] Fix margins
  1 file changed, 3 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index ecc60f99f..0e43f2c10 100644
+index 6a57376fa80..cbd62f714cb 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -333,17 +333,15 @@ grub_menu_init_page (int nested, int edit,

SOURCES/0031-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch

@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 0e43f2c10..537d4bf86 100644
+index cbd62f714cb..26e9e82042a 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -334,7 +334,7 @@ grub_menu_init_page (int nested, int edit,

SOURCES/0032-Enable-pager-by-default.-985860.patch

@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 93a90233e..858b526c9 100644
+index 93a90233ead..858b526c925 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
 @@ -43,6 +43,8 @@ if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved" ] ; then GRUB_DEFAULT_BUTTON='${saved_

SOURCES/0033-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch

@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 537d4bf86..452d55bf9 100644
+index 26e9e82042a..4895ffe7d1d 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -157,7 +157,7 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)

SOURCES/0034-Don-t-say-GNU-Linux-in-generated-menus.patch

@@ -9,7 +9,7 @@ Subject: [PATCH] Don't say "GNU/Linux" in generated menus.
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 3a5aa0f8d..6299836b5 100644
+index ad2ac4b078d..4fc58c83304 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
@@ -25,7 +25,7 @@ index 3a5aa0f8d..6299836b5 100644
  fi
  
 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index e8143b079..972a4b5a0 100644
+index 3b1f4704921..ada20775a14 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
 @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"

SOURCES/0035-Don-t-draw-a-border-around-the-menu.patch

@@ -9,7 +9,7 @@ It looks cleaner without it.
  1 file changed, 43 deletions(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 452d55bf9..1ed2bd92c 100644
+index 4895ffe7d1d..e72ed438ba3 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -108,47 +108,6 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,

SOURCES/0036-Use-the-standard-margin-for-the-timeout-string.patch

@@ -9,7 +9,7 @@ So that it aligns with the other messages
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 1ed2bd92c..7681f7d28 100644
+index e72ed438ba3..ca135624356 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -372,7 +372,7 @@ grub_menu_init_page (int nested, int edit,

SOURCES/0037-Add-.eh_frame-to-list-of-relocations-stripped.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] Add .eh_frame to list of relocations stripped
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 311da61c6..044ab3abe 100644
+index 2a1a886f6d5..191b1a70c6b 100644
 --- a/conf/Makefile.common
 +++ b/conf/Makefile.common
 @@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding

SOURCES/0038-Don-t-require-a-password-to-boot-entries-generated-b.patch

@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 6299836b5..b744438e0 100644
+index 4fc58c83304..635d2fe0cd3 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -26,7 +26,7 @@ datarootdir="@datarootdir@"

SOURCES/0039-Don-t-emit-Booting-.-message.patch

@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index d2f64b05e..5e2f5283d 100644
+index d7a222e681b..37d753d8081 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -838,12 +838,14 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
@@ -34,10 +34,10 @@ index d2f64b05e..5e2f5283d 100644
  
  /* Callback invoked when a default menu entry executed because of a timeout
 diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
-index cdf3590a3..5785f67ee 100644
+index 50eef918cf6..de64a367c4e 100644
 --- a/grub-core/normal/menu_entry.c
 +++ b/grub-core/normal/menu_entry.c
-@@ -1167,9 +1167,6 @@ run (struct screen *screen)
+@@ -1176,9 +1176,6 @@ run (struct screen *screen)
    char *dummy[1] = { NULL };
  
    grub_cls ();

SOURCES/0040-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch

@@ -44,7 +44,7 @@ Replace a bunch of machine generated ones with ones that look nicer.
  util/grub-file.1                  | 165 ++++++++++++++++++++++++++++++++++++++
  util/grub-fstest.1                |  99 +++++++++++++++++++++++
  util/grub-glue-efi.1              |  31 +++++++
- util/grub-install.8               | 129 +++++++++++++++++++++++++++++
+ util/grub-install.8               | 128 +++++++++++++++++++++++++++++
  util/grub-kbdcomp.1               |  19 +++++
  util/grub-macbless.1              |  22 +++++
  util/grub-menulst2cfg.1           |  12 +++
@@ -64,7 +64,7 @@ Replace a bunch of machine generated ones with ones that look nicer.
  util/grub-script-check.1          |  21 +++++
  util/grub-set-default.8           |  21 +++++
  util/grub-sparc64-setup.8         |  12 +++
- 59 files changed, 1319 insertions(+), 147 deletions(-)
+ 59 files changed, 1318 insertions(+), 147 deletions(-)
  delete mode 100644 docs/man/grub-bios-setup.h2m
  delete mode 100644 docs/man/grub-editenv.h2m
  delete mode 100644 docs/man/grub-emu.h2m
@@ -122,10 +122,10 @@ Replace a bunch of machine generated ones with ones that look nicer.
  create mode 100644 util/grub-sparc64-setup.8
 
 diff --git a/configure.ac b/configure.ac
-index 783118ccd..d5db2803e 100644
+index 8331f95b645..bec8535af70 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -70,6 +70,29 @@ grub_TRANSFORM([grub-set-default])
+@@ -77,6 +77,29 @@ grub_TRANSFORM([grub-set-default])
  grub_TRANSFORM([grub-sparc64-setup])
  grub_TRANSFORM([grub-render-label])
  grub_TRANSFORM([grub-file])
@@ -156,7 +156,7 @@ index 783118ccd..d5db2803e 100644
  # Optimization flag.  Allow user to override.
  if test "x$TARGET_CFLAGS" = x; then
 diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
-index b16bd9253..39eb94bde 100644
+index 8f1485d52a5..b909f2c073a 100644
 --- a/conf/Makefile.extra-dist
 +++ b/conf/Makefile.extra-dist
 @@ -11,7 +11,6 @@ EXTRA_DIST += unicode
@@ -168,7 +168,7 @@ index b16bd9253..39eb94bde 100644
  EXTRA_DIST += docs/grub.cfg
  EXTRA_DIST += docs/osdetect.cfg
 diff --git a/docs/Makefile.am b/docs/Makefile.am
-index 93eb39627..ab28f1996 100644
+index 93eb3962765..ab28f199694 100644
 --- a/docs/Makefile.am
 +++ b/docs/Makefile.am
 @@ -5,5 +5,3 @@ info_TEXINFOS = grub.texi grub-dev.texi
@@ -179,7 +179,7 @@ index 93eb39627..ab28f1996 100644
 -
 diff --git a/docs/man/grub-bios-setup.h2m b/docs/man/grub-bios-setup.h2m
 deleted file mode 100644
-index ac6ede362..000000000
+index ac6ede36296..00000000000
 --- a/docs/man/grub-bios-setup.h2m
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -191,7 +191,7 @@ index ac6ede362..000000000
 -.BR grub-mkrescue (1)
 diff --git a/docs/man/grub-editenv.h2m b/docs/man/grub-editenv.h2m
 deleted file mode 100644
-index 3859d3d4c..000000000
+index 3859d3d4c4f..00000000000
 --- a/docs/man/grub-editenv.h2m
 +++ /dev/null
 @@ -1,5 +0,0 @@
@@ -202,7 +202,7 @@ index 3859d3d4c..000000000
 -.BR grub-set-default (8)
 diff --git a/docs/man/grub-emu.h2m b/docs/man/grub-emu.h2m
 deleted file mode 100644
-index ef1c00065..000000000
+index ef1c000656a..00000000000
 --- a/docs/man/grub-emu.h2m
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -214,7 +214,7 @@ index ef1c00065..000000000
 -rather than this program.
 diff --git a/docs/man/grub-file.h2m b/docs/man/grub-file.h2m
 deleted file mode 100644
-index e09bb4d31..000000000
+index e09bb4d3101..00000000000
 --- a/docs/man/grub-file.h2m
 +++ /dev/null
 @@ -1,2 +0,0 @@
@@ -222,7 +222,7 @@ index e09bb4d31..000000000
 -grub-file \- check file type
 diff --git a/docs/man/grub-fstest.h2m b/docs/man/grub-fstest.h2m
 deleted file mode 100644
-index 9676b159a..000000000
+index 9676b159afd..00000000000
 --- a/docs/man/grub-fstest.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -232,7 +232,7 @@ index 9676b159a..000000000
 -.BR grub-probe (8)
 diff --git a/docs/man/grub-glue-efi.h2m b/docs/man/grub-glue-efi.h2m
 deleted file mode 100644
-index c1c6ded49..000000000
+index c1c6ded49ff..00000000000
 --- a/docs/man/grub-glue-efi.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -242,7 +242,7 @@ index c1c6ded49..000000000
 -grub-glue-efi processes ia32 and amd64 EFI images and glues them according to Apple format.
 diff --git a/docs/man/grub-install.h2m b/docs/man/grub-install.h2m
 deleted file mode 100644
-index 8cbbc87a0..000000000
+index 8cbbc87a0f2..00000000000
 --- a/docs/man/grub-install.h2m
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -254,7 +254,7 @@ index 8cbbc87a0..000000000
 -.BR grub-mkrescue (1)
 diff --git a/docs/man/grub-kbdcomp.h2m b/docs/man/grub-kbdcomp.h2m
 deleted file mode 100644
-index d81f9157e..000000000
+index d81f9157e01..00000000000
 --- a/docs/man/grub-kbdcomp.h2m
 +++ /dev/null
 @@ -1,10 +0,0 @@
@@ -270,7 +270,7 @@ index d81f9157e..000000000
 -.BR grub-mklayout (8)
 diff --git a/docs/man/grub-macbless.h2m b/docs/man/grub-macbless.h2m
 deleted file mode 100644
-index 0197c0087..000000000
+index 0197c0087d7..00000000000
 --- a/docs/man/grub-macbless.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -280,7 +280,7 @@ index 0197c0087..000000000
 -.BR grub-install (1)
 diff --git a/docs/man/grub-macho2img.h2m b/docs/man/grub-macho2img.h2m
 deleted file mode 100644
-index d79aaeed8..000000000
+index d79aaeed8f9..00000000000
 --- a/docs/man/grub-macho2img.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -290,7 +290,7 @@ index d79aaeed8..000000000
 -.BR grub-mkimage (1)
 diff --git a/docs/man/grub-menulst2cfg.h2m b/docs/man/grub-menulst2cfg.h2m
 deleted file mode 100644
-index c2e0055ed..000000000
+index c2e0055ed7e..00000000000
 --- a/docs/man/grub-menulst2cfg.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -300,7 +300,7 @@ index c2e0055ed..000000000
 -.BR grub-mkconfig (8)
 diff --git a/docs/man/grub-mkconfig.h2m b/docs/man/grub-mkconfig.h2m
 deleted file mode 100644
-index 9b42f8130..000000000
+index 9b42f813010..00000000000
 --- a/docs/man/grub-mkconfig.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -310,7 +310,7 @@ index 9b42f8130..000000000
 -.BR grub-install (8)
 diff --git a/docs/man/grub-mkfont.h2m b/docs/man/grub-mkfont.h2m
 deleted file mode 100644
-index d46fe600e..000000000
+index d46fe600eca..00000000000
 --- a/docs/man/grub-mkfont.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -320,7 +320,7 @@ index d46fe600e..000000000
 -.BR grub-mkconfig (8)
 diff --git a/docs/man/grub-mkimage.h2m b/docs/man/grub-mkimage.h2m
 deleted file mode 100644
-index f0fbc2bb1..000000000
+index f0fbc2bb197..00000000000
 --- a/docs/man/grub-mkimage.h2m
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -332,7 +332,7 @@ index f0fbc2bb1..000000000
 -.BR grub-mknetdir (8)
 diff --git a/docs/man/grub-mklayout.h2m b/docs/man/grub-mklayout.h2m
 deleted file mode 100644
-index 1e43409c0..000000000
+index 1e43409c0ab..00000000000
 --- a/docs/man/grub-mklayout.h2m
 +++ /dev/null
 @@ -1,10 +0,0 @@
@@ -348,7 +348,7 @@ index 1e43409c0..000000000
 -.BR grub-mkconfig (8)
 diff --git a/docs/man/grub-mknetdir.h2m b/docs/man/grub-mknetdir.h2m
 deleted file mode 100644
-index a2ef13ec1..000000000
+index a2ef13ec111..00000000000
 --- a/docs/man/grub-mknetdir.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -358,7 +358,7 @@ index a2ef13ec1..000000000
 -.BR grub-mkimage (1)
 diff --git a/docs/man/grub-mkpasswd-pbkdf2.h2m b/docs/man/grub-mkpasswd-pbkdf2.h2m
 deleted file mode 100644
-index 4d202f3da..000000000
+index 4d202f3da7e..00000000000
 --- a/docs/man/grub-mkpasswd-pbkdf2.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -368,7 +368,7 @@ index 4d202f3da..000000000
 -.BR grub-mkconfig (8)
 diff --git a/docs/man/grub-mkrelpath.h2m b/docs/man/grub-mkrelpath.h2m
 deleted file mode 100644
-index d01f3961e..000000000
+index d01f3961e3f..00000000000
 --- a/docs/man/grub-mkrelpath.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -378,7 +378,7 @@ index d01f3961e..000000000
 -.BR grub-probe (8)
 diff --git a/docs/man/grub-mkrescue.h2m b/docs/man/grub-mkrescue.h2m
 deleted file mode 100644
-index a427f02e3..000000000
+index a427f02e3c6..00000000000
 --- a/docs/man/grub-mkrescue.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -388,7 +388,7 @@ index a427f02e3..000000000
 -.BR grub-mkimage (1)
 diff --git a/docs/man/grub-mkstandalone.h2m b/docs/man/grub-mkstandalone.h2m
 deleted file mode 100644
-index c77313978..000000000
+index c77313978ad..00000000000
 --- a/docs/man/grub-mkstandalone.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -398,7 +398,7 @@ index c77313978..000000000
 -.BR grub-mkimage (1)
 diff --git a/docs/man/grub-mount.h2m b/docs/man/grub-mount.h2m
 deleted file mode 100644
-index 8d168982d..000000000
+index 8d168982d72..00000000000
 --- a/docs/man/grub-mount.h2m
 +++ /dev/null
 @@ -1,2 +0,0 @@
@@ -406,7 +406,7 @@ index 8d168982d..000000000
 -grub-mount \- export GRUB filesystem with FUSE
 diff --git a/docs/man/grub-ofpathname.h2m b/docs/man/grub-ofpathname.h2m
 deleted file mode 100644
-index 74b43eea0..000000000
+index 74b43eea039..00000000000
 --- a/docs/man/grub-ofpathname.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -416,7 +416,7 @@ index 74b43eea0..000000000
 -.BR grub-probe (8)
 diff --git a/docs/man/grub-pe2elf.h2m b/docs/man/grub-pe2elf.h2m
 deleted file mode 100644
-index 7ca29bd70..000000000
+index 7ca29bd703c..00000000000
 --- a/docs/man/grub-pe2elf.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -426,7 +426,7 @@ index 7ca29bd70..000000000
 -.BR grub-mkimage (1)
 diff --git a/docs/man/grub-probe.h2m b/docs/man/grub-probe.h2m
 deleted file mode 100644
-index 6e1ffdcf9..000000000
+index 6e1ffdcf937..00000000000
 --- a/docs/man/grub-probe.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -436,7 +436,7 @@ index 6e1ffdcf9..000000000
 -.BR grub-fstest (1)
 diff --git a/docs/man/grub-reboot.h2m b/docs/man/grub-reboot.h2m
 deleted file mode 100644
-index e4acace65..000000000
+index e4acace65ce..00000000000
 --- a/docs/man/grub-reboot.h2m
 +++ /dev/null
 @@ -1,5 +0,0 @@
@@ -447,7 +447,7 @@ index e4acace65..000000000
 -.BR grub-editenv (1)
 diff --git a/docs/man/grub-render-label.h2m b/docs/man/grub-render-label.h2m
 deleted file mode 100644
-index 50ae5247c..000000000
+index 50ae5247c05..00000000000
 --- a/docs/man/grub-render-label.h2m
 +++ /dev/null
 @@ -1,3 +0,0 @@
@@ -456,7 +456,7 @@ index 50ae5247c..000000000
 -
 diff --git a/docs/man/grub-script-check.h2m b/docs/man/grub-script-check.h2m
 deleted file mode 100644
-index 365368267..000000000
+index 3653682671a..00000000000
 --- a/docs/man/grub-script-check.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -466,7 +466,7 @@ index 365368267..000000000
 -.BR grub-mkconfig (8)
 diff --git a/docs/man/grub-set-default.h2m b/docs/man/grub-set-default.h2m
 deleted file mode 100644
-index 7945001c1..000000000
+index 7945001c154..00000000000
 --- a/docs/man/grub-set-default.h2m
 +++ /dev/null
 @@ -1,5 +0,0 @@
@@ -477,7 +477,7 @@ index 7945001c1..000000000
 -.BR grub-editenv (1)
 diff --git a/docs/man/grub-sparc64-setup.h2m b/docs/man/grub-sparc64-setup.h2m
 deleted file mode 100644
-index 18f803a50..000000000
+index 18f803a50db..00000000000
 --- a/docs/man/grub-sparc64-setup.h2m
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -489,7 +489,7 @@ index 18f803a50..000000000
 -.BR grub-mkrescue (1)
 diff --git a/docs/man/grub-syslinux2cfg.h2m b/docs/man/grub-syslinux2cfg.h2m
 deleted file mode 100644
-index ad25c8ab7..000000000
+index ad25c8ab753..00000000000
 --- a/docs/man/grub-syslinux2cfg.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -498,10 +498,10 @@ index ad25c8ab7..000000000
 -[SEE ALSO]
 -.BR grub-menulst2cfg (8)
 diff --git a/gentpl.py b/gentpl.py
-index da67965a4..bf8439fa7 100644
+index c86550d4f9e..2cba0bbbd6f 100644
 --- a/gentpl.py
 +++ b/gentpl.py
-@@ -802,10 +802,7 @@ def manpage(defn, adddeps):
+@@ -805,10 +805,7 @@ def manpage(defn, adddeps):
  
      output("if COND_MAN_PAGES\n")
      gvar_add("man_MANS", name + "." + mansection)
@@ -515,7 +515,7 @@ index da67965a4..bf8439fa7 100644
  
 diff --git a/util/grub-bios-setup.8 b/util/grub-bios-setup.8
 new file mode 100644
-index 000000000..56f582b3d
+index 00000000000..56f582b3d75
 --- /dev/null
 +++ b/util/grub-bios-setup.8
 @@ -0,0 +1,54 @@
@@ -575,7 +575,7 @@ index 000000000..56f582b3d
 +.BR "info grub"
 diff --git a/util/grub-editenv.1 b/util/grub-editenv.1
 new file mode 100644
-index 000000000..d28ba03ba
+index 00000000000..d28ba03ba42
 --- /dev/null
 +++ b/util/grub-editenv.1
 @@ -0,0 +1,46 @@
@@ -627,7 +627,7 @@ index 000000000..d28ba03ba
 +.BR "info grub"
 diff --git a/util/grub-file.1 b/util/grub-file.1
 new file mode 100644
-index 000000000..b29cb3278
+index 00000000000..b29cb327889
 --- /dev/null
 +++ b/util/grub-file.1
 @@ -0,0 +1,165 @@
@@ -798,7 +798,7 @@ index 000000000..b29cb3278
 +.BR "info grub"
 diff --git a/util/grub-fstest.1 b/util/grub-fstest.1
 new file mode 100644
-index 000000000..792fa7863
+index 00000000000..792fa78634c
 --- /dev/null
 +++ b/util/grub-fstest.1
 @@ -0,0 +1,99 @@
@@ -903,7 +903,7 @@ index 000000000..792fa7863
 +.BR "info grub"
 diff --git a/util/grub-glue-efi.1 b/util/grub-glue-efi.1
 new file mode 100644
-index 000000000..72bd555d5
+index 00000000000..72bd555d577
 --- /dev/null
 +++ b/util/grub-glue-efi.1
 @@ -0,0 +1,31 @@
@@ -940,10 +940,10 @@ index 000000000..72bd555d5
 +.BR "info grub"
 diff --git a/util/grub-install.8 b/util/grub-install.8
 new file mode 100644
-index 000000000..76272a39d
+index 00000000000..1db89e94b3b
 --- /dev/null
 +++ b/util/grub-install.8
-@@ -0,0 +1,129 @@
+@@ -0,0 +1,128 @@
 +.TH GRUB-INSTALL 1 "Wed Feb 26 2014"
 +.SH NAME
 +\fBgrub-install\fR \(em Install GRUB on a device.
@@ -1060,12 +1060,11 @@ index 000000000..76272a39d
 +
 +.TP
 +\fB--bootloader-id\fR=\fIID\fR
-+Use \fIID\fR as the bootloader ID.  This opption is only available on the EFI target platform.
++Use \fIID\fR as the bootloader ID.  This option is only available on the EFI target platform.
 +
 +.TP
 +\fB--efi-directory\fR=\fIDIR\fR
-+Use \fIDIR\fR as the EFI System Partition root.  This opption is only available on the EFI ta
-+rget platform.
++Use \fIDIR\fR as the EFI System Partition root.  This option is only available on the EFI target platform.
 +
 +.TP
 +\fIINSTALL_DEVICE\fR
@@ -1075,7 +1074,7 @@ index 000000000..76272a39d
 +.BR "info grub"
 diff --git a/util/grub-kbdcomp.1 b/util/grub-kbdcomp.1
 new file mode 100644
-index 000000000..0bb969a5b
+index 00000000000..0bb969a5b43
 --- /dev/null
 +++ b/util/grub-kbdcomp.1
 @@ -0,0 +1,19 @@
@@ -1100,7 +1099,7 @@ index 000000000..0bb969a5b
 +.BR "info grub"
 diff --git a/util/grub-macbless.1 b/util/grub-macbless.1
 new file mode 100644
-index 000000000..41a96186f
+index 00000000000..41a96186f70
 --- /dev/null
 +++ b/util/grub-macbless.1
 @@ -0,0 +1,22 @@
@@ -1128,7 +1127,7 @@ index 000000000..41a96186f
 +.BR "info grub"
 diff --git a/util/grub-menulst2cfg.1 b/util/grub-menulst2cfg.1
 new file mode 100644
-index 000000000..91e2ef871
+index 00000000000..91e2ef87113
 --- /dev/null
 +++ b/util/grub-menulst2cfg.1
 @@ -0,0 +1,12 @@
@@ -1146,7 +1145,7 @@ index 000000000..91e2ef871
 +.BR "info grub"
 diff --git a/util/grub-mkconfig.8 b/util/grub-mkconfig.8
 new file mode 100644
-index 000000000..a2d1f577b
+index 00000000000..a2d1f577b9b
 --- /dev/null
 +++ b/util/grub-mkconfig.8
 @@ -0,0 +1,17 @@
@@ -1169,7 +1168,7 @@ index 000000000..a2d1f577b
 +.BR "info grub"
 diff --git a/util/grub-mkfont.1 b/util/grub-mkfont.1
 new file mode 100644
-index 000000000..349485798
+index 00000000000..3494857987d
 --- /dev/null
 +++ b/util/grub-mkfont.1
 @@ -0,0 +1,87 @@
@@ -1262,7 +1261,7 @@ index 000000000..349485798
 +.BR "info grub"
 diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1
 new file mode 100644
-index 000000000..4dea4f545
+index 00000000000..4dea4f54597
 --- /dev/null
 +++ b/util/grub-mkimage.1
 @@ -0,0 +1,95 @@
@@ -1363,7 +1362,7 @@ index 000000000..4dea4f545
 +.BR "info grub"
 diff --git a/util/grub-mklayout.1 b/util/grub-mklayout.1
 new file mode 100644
-index 000000000..d1bbc2ec5
+index 00000000000..d1bbc2ec515
 --- /dev/null
 +++ b/util/grub-mklayout.1
 @@ -0,0 +1,27 @@
@@ -1396,7 +1395,7 @@ index 000000000..d1bbc2ec5
 +.BR "info grub"
 diff --git a/util/grub-mknetdir.1 b/util/grub-mknetdir.1
 new file mode 100644
-index 000000000..fa7e8d4ef
+index 00000000000..fa7e8d4ef0d
 --- /dev/null
 +++ b/util/grub-mknetdir.1
 @@ -0,0 +1,12 @@
@@ -1414,7 +1413,7 @@ index 000000000..fa7e8d4ef
 +.BR "info grub"
 diff --git a/util/grub-mkpasswd-pbkdf2.1 b/util/grub-mkpasswd-pbkdf2.1
 new file mode 100644
-index 000000000..73c437c15
+index 00000000000..73c437c15d8
 --- /dev/null
 +++ b/util/grub-mkpasswd-pbkdf2.1
 @@ -0,0 +1,27 @@
@@ -1447,7 +1446,7 @@ index 000000000..73c437c15
 +.BR "info grub"
 diff --git a/util/grub-mkrelpath.1 b/util/grub-mkrelpath.1
 new file mode 100644
-index 000000000..85f111362
+index 00000000000..85f1113621d
 --- /dev/null
 +++ b/util/grub-mkrelpath.1
 @@ -0,0 +1,12 @@
@@ -1465,7 +1464,7 @@ index 000000000..85f111362
 +.BR "info grub"
 diff --git a/util/grub-mkrescue.1 b/util/grub-mkrescue.1
 new file mode 100644
-index 000000000..4ed9fc723
+index 00000000000..4ed9fc723fd
 --- /dev/null
 +++ b/util/grub-mkrescue.1
 @@ -0,0 +1,123 @@
@@ -1594,7 +1593,7 @@ index 000000000..4ed9fc723
 +.BR "info grub"
 diff --git a/util/grub-mkstandalone.1 b/util/grub-mkstandalone.1
 new file mode 100644
-index 000000000..ba2d2bdf2
+index 00000000000..ba2d2bdf279
 --- /dev/null
 +++ b/util/grub-mkstandalone.1
 @@ -0,0 +1,100 @@
@@ -1700,7 +1699,7 @@ index 000000000..ba2d2bdf2
 +.BR "info grub"
 diff --git a/util/grub-ofpathname.8 b/util/grub-ofpathname.8
 new file mode 100644
-index 000000000..bf3743aeb
+index 00000000000..bf3743aeba1
 --- /dev/null
 +++ b/util/grub-ofpathname.8
 @@ -0,0 +1,12 @@
@@ -1718,7 +1717,7 @@ index 000000000..bf3743aeb
 +.BR "info grub"
 diff --git a/util/grub-probe.8 b/util/grub-probe.8
 new file mode 100644
-index 000000000..04e26c832
+index 00000000000..04e26c832bb
 --- /dev/null
 +++ b/util/grub-probe.8
 @@ -0,0 +1,80 @@
@@ -1804,7 +1803,7 @@ index 000000000..04e26c832
 +.BR "info grub"
 diff --git a/util/grub-reboot.8 b/util/grub-reboot.8
 new file mode 100644
-index 000000000..faa5e4eec
+index 00000000000..faa5e4eece2
 --- /dev/null
 +++ b/util/grub-reboot.8
 @@ -0,0 +1,21 @@
@@ -1831,7 +1830,7 @@ index 000000000..faa5e4eec
 +.BR "info grub"
 diff --git a/util/grub-render-label.1 b/util/grub-render-label.1
 new file mode 100644
-index 000000000..4d51c8abf
+index 00000000000..4d51c8abf01
 --- /dev/null
 +++ b/util/grub-render-label.1
 @@ -0,0 +1,51 @@
@@ -1888,7 +1887,7 @@ index 000000000..4d51c8abf
 +.BR "info grub"
 diff --git a/util/grub-script-check.1 b/util/grub-script-check.1
 new file mode 100644
-index 000000000..0f1f625b0
+index 00000000000..0f1f625b05d
 --- /dev/null
 +++ b/util/grub-script-check.1
 @@ -0,0 +1,21 @@
@@ -1915,7 +1914,7 @@ index 000000000..0f1f625b0
 +.BR "info grub"
 diff --git a/util/grub-set-default.8 b/util/grub-set-default.8
 new file mode 100644
-index 000000000..a96265a15
+index 00000000000..a96265a1509
 --- /dev/null
 +++ b/util/grub-set-default.8
 @@ -0,0 +1,21 @@
@@ -1942,7 +1941,7 @@ index 000000000..a96265a15
 +.BR "info grub"
 diff --git a/util/grub-sparc64-setup.8 b/util/grub-sparc64-setup.8
 new file mode 100644
-index 000000000..37ea2dd5e
+index 00000000000..37ea2dd5eaa
 --- /dev/null
 +++ b/util/grub-sparc64-setup.8
 @@ -0,0 +1,12 @@

SOURCES/0041-use-fw_path-prefix-when-fallback-searching-for-grub-.patch

@@ -17,10 +17,10 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 0ce59fdc3..a3713efcd 100644
+index ec1cd257397..d85f7598d23 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -343,7 +343,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
+@@ -349,7 +349,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
        char *config;
        const char *prefix, *fw_path;
  
@@ -29,7 +29,7 @@ index 0ce59fdc3..a3713efcd 100644
        if (fw_path)
  	{
  	  config = grub_xasprintf ("%s/grub.cfg", fw_path);
-@@ -366,7 +366,8 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
+@@ -372,7 +372,8 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
  	    }
  	}
  

SOURCES/0042-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch

@@ -0,0 +1,127 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 8 Jul 2019 17:33:22 +0200
+Subject: [PATCH] Try mac/guid/etc before grub.cfg on tftp config files.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/normal/main.c | 97 ++++++++++++++++++++++++++-----------------------
+ 1 file changed, 51 insertions(+), 46 deletions(-)
+
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index d85f7598d23..1e509fceb91 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -347,61 +347,66 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
+       /* Guess the config filename. It is necessary to make CONFIG static,
+ 	 so that it won't get broken by longjmp.  */
+       char *config;
+-      const char *prefix, *fw_path;
+-
+-      prefix = fw_path = grub_env_get ("fw_path");
+-      if (fw_path)
+-	{
+-	  config = grub_xasprintf ("%s/grub.cfg", fw_path);
+-	  if (config)
+-	    {
+-	      grub_file_t file;
+-
+-	      file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
+-	      if (file)
+-		{
+-		  grub_file_close (file);
+-		  grub_enter_normal_mode (config);
+-		}
+-              else
+-                {
+-                  /*  Ignore all errors.  */
+-                  grub_errno = 0;
+-                }
+-	      grub_free (config);
+-	    }
+-	}
++      const char *prefix;
++      const char *net_search_cfg;
++      int disable_net_search = 0;
+ 
++      prefix = grub_env_get ("fw_path");
+       if (! prefix)
+ 	      prefix = grub_env_get ("prefix");
++
++      net_search_cfg = grub_env_get ("feature_net_search_cfg");
++      if (net_search_cfg && net_search_cfg[0] == 'n')
++	      disable_net_search = 1;
++
+       if (prefix)
+         {
+-          grub_size_t config_len;
+-          int disable_net_search = 0;
+-          const char *net_search_cfg;
+-
+-          config_len = grub_strlen (prefix) +
+-                       sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
+-          config = grub_malloc (config_len);
+-
+-          if (!config)
+-            goto quit;
+-
+-          grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
+-
+-          net_search_cfg = grub_env_get ("feature_net_search_cfg");
+-          if (net_search_cfg && net_search_cfg[0] == 'n')
+-            disable_net_search = 1;
+-
+           if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0 &&
+               !disable_net_search)
+-            grub_net_search_config_file (config);
++            {
++              grub_size_t config_len;
++              config_len = grub_strlen (prefix) +
++                sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
++              config = grub_malloc (config_len);
+ 
+-	  grub_enter_normal_mode (config);
+-	  grub_free (config);
+-	}
++              if (! config)
++                goto quit;
++
++              grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
++
++              grub_net_search_configfile (config);
++
++              grub_enter_normal_mode (config);
++              grub_free (config);
++              config = NULL;
++            }
++
++          if (!config)
++            {
++              config = grub_xasprintf ("%s/grub.cfg", prefix);
++              if (config)
++                {
++                  grub_file_t file;
++
++                  file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
++                  if (file)
++                    {
++                      grub_file_close (file);
++                      grub_enter_normal_mode (config);
++                    }
++                  else
++                    {
++                      /*  Ignore all errors.  */
++                      grub_errno = 0;
++                    }
++                  grub_free (config);
++                }
++            }
++        }
+       else
+-	grub_enter_normal_mode (0);
++        {
++          grub_enter_normal_mode (0);
++        }
+     }
+   else
+     grub_enter_normal_mode (argv[0]);

SOURCES/0043-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch

@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index b744438e0..43d98476b 100644
+index 635d2fe0cd3..fed73271478 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@"

SOURCES/0044-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch

@@ -10,10 +10,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 1001a1223..1a4a57898 100644
+index 301d1ac229a..0f6505bf3b6 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
-@@ -249,6 +249,14 @@ version_test_gt ()
+@@ -253,6 +253,14 @@ version_test_gt ()
      *.old:*.old) ;;
      *.old:*) version_test_gt_a="`echo "$version_test_gt_a" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=gt ;;
      *:*.old) version_test_gt_b="`echo "$version_test_gt_b" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=ge ;;

SOURCES/0045-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch

@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Mon, 30 Jun 2014 14:16:46 -0400
-Subject: [PATCH] Don't munge raw spaces when we're doing our cmdline escaping
- (#923374)
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/lib/cmdline.c | 11 +----------
- 1 file changed, 1 insertion(+), 10 deletions(-)
-
-diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
-index 0a5b2afb9..970ea868c 100644
---- a/grub-core/lib/cmdline.c
-+++ b/grub-core/lib/cmdline.c
-@@ -97,16 +97,7 @@ int grub_create_loader_cmdline (int argc, char *argv[], char *buf,
- 
-       while (*c)
- 	{
--	  if (*c == ' ')
--	    {
--	      *buf++ = '\\';
--	      *buf++ = 'x';
--	      *buf++ = '2';
--	      *buf++ = '0';
--	      c++;
--	      continue;
--	    }
--	  else if (*c == '\\' && *(c+1) == 'x' &&
-+	  if (*c == '\\' && *(c+1) == 'x' &&
- 		   is_hex(*(c+2)) && is_hex(*(c+3)))
- 	    {
- 	      *buf++ = *c++;

SOURCES/0045-Try-prefix-if-fw_path-doesn-t-work.patch

@@ -1,22 +1,22 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
-Date: Fri, 3 Oct 2014 11:08:03 -0400
+Date: Tue, 9 Jul 2019 10:35:16 +0200
 Subject: [PATCH] Try $prefix if $fw_path doesn't work.
 
 Related: rhbz#1148652
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- grub-core/kern/ieee1275/init.c |  28 +++++-----
+ grub-core/kern/ieee1275/init.c |  28 +++++----
  grub-core/net/net.c            |   2 +-
- grub-core/normal/main.c        | 120 ++++++++++++++++++++---------------------
- 3 files changed, 75 insertions(+), 75 deletions(-)
+ grub-core/normal/main.c        | 134 ++++++++++++++++++++---------------------
+ 3 files changed, 82 insertions(+), 82 deletions(-)
 
 diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index f5423ce27..e01bc6eab 100644
+index e71d1584164..0cd2a627231 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
-@@ -124,23 +124,25 @@ grub_machine_get_bootlocation (char **device, char **path)
+@@ -127,23 +127,25 @@ grub_machine_get_bootlocation (char **device, char **path)
        grub_free (canon);
      }
    else
@@ -56,10 +56,10 @@ index f5423ce27..e01bc6eab 100644
  }
  
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 0769bf850..16d2ce06d 100644
+index 4d3eb5c1a52..0ef148f4adc 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
-@@ -1850,7 +1850,7 @@ grub_net_search_configfile (char *config)
+@@ -1869,7 +1869,7 @@ grub_net_search_config_file (char *config)
    /* Remove the remaining minus sign at the end. */
    config[config_len] = '\0';
  
@@ -69,10 +69,10 @@ index 0769bf850..16d2ce06d 100644
  
  static struct grub_preboot *fini_hnd;
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 7d9c4f09b..b69f9e738 100644
+index 1e509fceb91..d5968797f4f 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -331,74 +331,72 @@ grub_enter_normal_mode (const char *config)
+@@ -337,81 +337,79 @@ grub_enter_normal_mode (const char *config)
    grub_boot_time ("Exiting normal mode");
  }
  
@@ -82,38 +82,45 @@ index 7d9c4f09b..b69f9e738 100644
 +    char *config;
 +    const char *prefix;
 +    grub_err_t err = GRUB_ERR_FILE_NOT_FOUND;
++    const char *net_search_cfg;
++    int disable_net_search = 0;
 +
 +    prefix = grub_env_get (variable);
 +    if (!prefix)
 +      return GRUB_ERR_FILE_NOT_FOUND;
 +
-+    if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0)
++    net_search_cfg = grub_env_get ("feature_net_search_cfg");
++    if (net_search_cfg && net_search_cfg[0] == 'n')
++      disable_net_search = 1;
++
++    if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0 &&
++        !disable_net_search)
 +      {
-+	grub_size_t config_len;
-+	config_len = grub_strlen (prefix) +
-+	  sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
-+	config = grub_malloc (config_len);
++       grub_size_t config_len;
++       config_len = grub_strlen (prefix) +
++         sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
++       config = grub_malloc (config_len);
 +
-+	if (! config)
-+	  return GRUB_ERR_FILE_NOT_FOUND;
++       if (! config)
++         return GRUB_ERR_FILE_NOT_FOUND;
 +
-+	grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
-+	err = grub_net_search_configfile (config);
++       grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
++       err = grub_net_search_config_file (config);
 +      }
 +
 +    if (err != GRUB_ERR_NONE)
 +      {
-+	config = grub_xasprintf ("%s/grub.cfg", prefix);
-+	if (config)
-+	  {
-+	    grub_file_t file;
-+	    file = grub_file_open (config);
-+	    if (file)
-+	      {
-+		grub_file_close (file);
-+		err = GRUB_ERR_NONE;
-+	      }
-+	  }
++       config = grub_xasprintf ("%s/grub.cfg", prefix);
++       if (config)
++         {
++           grub_file_t file;
++           file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
++           if (file)
++             {
++               grub_file_close (file);
++               err = GRUB_ERR_NONE;
++             }
++         }
 +      }
 +
 +    if (err == GRUB_ERR_NONE)
@@ -135,58 +142,65 @@ index 7d9c4f09b..b69f9e738 100644
 -	 so that it won't get broken by longjmp.  */
 -      char *config;
 -      const char *prefix;
+-      const char *net_search_cfg;
+-      int disable_net_search = 0;
 -
 -      prefix = grub_env_get ("fw_path");
 -      if (! prefix)
 -	      prefix = grub_env_get ("prefix");
 -
+-      net_search_cfg = grub_env_get ("feature_net_search_cfg");
+-      if (net_search_cfg && net_search_cfg[0] == 'n')
+-	      disable_net_search = 1;
+-
 -      if (prefix)
--	{
--	  if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0)
--	    {
--	      grub_size_t config_len;
--	      config_len = grub_strlen (prefix) +
--		sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
--	      config = grub_malloc (config_len);
+-        {
+-          if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0 &&
+-              !disable_net_search)
+-            {
+-              grub_size_t config_len;
+-              config_len = grub_strlen (prefix) +
+-                sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
+-              config = grub_malloc (config_len);
 -
--	      if (! config)
--		goto quit;
+-              if (! config)
+-                goto quit;
 -
--	      grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
+-              grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
 -
--	      grub_net_search_configfile (config);
+-              grub_net_search_configfile (config);
 -
--	      grub_enter_normal_mode (config);
--	      grub_free (config);
--	      config = NULL;
--	    }
+-              grub_enter_normal_mode (config);
+-              grub_free (config);
+-              config = NULL;
+-            }
 -
--	  if (!config)
--	    {
--	      config = grub_xasprintf ("%s/grub.cfg", prefix);
--	      if (config)
--		{
--		  grub_file_t file;
+-          if (!config)
+-            {
+-              config = grub_xasprintf ("%s/grub.cfg", prefix);
+-              if (config)
+-                {
+-                  grub_file_t file;
 -
--		  file = grub_file_open (config);
--		  if (file)
--		    {
--		      grub_file_close (file);
--		      grub_enter_normal_mode (config);
--		    }
--		  else
--		    {
--		      /*  Ignore all errors.  */
--		      grub_errno = 0;
--		    }
--		  grub_free (config);
--		}
--	    }
--	}
+-                  file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
+-                  if (file)
+-                    {
+-                      grub_file_close (file);
+-                      grub_enter_normal_mode (config);
+-                    }
+-                  else
+-                    {
+-                      /*  Ignore all errors.  */
+-                      grub_errno = 0;
+-                    }
+-                  grub_free (config);
+-                }
+-            }
+-        }
 -      else
--	{
--	  grub_enter_normal_mode (0);
--	}
+-        {
+-          grub_enter_normal_mode (0);
+-        }
 -    }
 -  else
 +  if (argc)

SOURCES/0046-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch

@@ -9,22 +9,27 @@ starting with the most recent. Added an option for rpm-based systems to
 use the rpm-sort library to sort kernels instead.
 
 Resolves rhbz#1124074
+
+Signed-off-by: Robert Marshall <rmarshall@redhat.com>
+[pjones: fix --enable-rpm-sort configure option]
+Signed-off-by: Peter Jones <pjones@redhat.com>
+[thierry.vignaud: fix build with rpm-4.16]
+Signed-off-by: Thierry Vignaud <thierry.vignaud@gmail.com>
 ---
- configure.ac              |  29 +++++
+ configure.ac              |  38 +++++++
  Makefile.util.def         |  16 +++
  util/grub-rpm-sort.c      | 281 ++++++++++++++++++++++++++++++++++++++++++++++
- .gitignore                |   2 +
- util/grub-mkconfig_lib.in |   8 +-
+ util/grub-mkconfig_lib.in |  11 +-
  util/grub-rpm-sort.8      |  12 ++
- 6 files changed, 347 insertions(+), 1 deletion(-)
+ 5 files changed, 357 insertions(+), 1 deletion(-)
  create mode 100644 util/grub-rpm-sort.c
  create mode 100644 util/grub-rpm-sort.8
 
 diff --git a/configure.ac b/configure.ac
-index d5db2803e..056df1cba 100644
+index bec8535af70..fdcb452581c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -65,6 +65,7 @@ grub_TRANSFORM([grub-mkrelpath])
+@@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
  grub_TRANSFORM([grub-mkrescue])
  grub_TRANSFORM([grub-probe])
  grub_TRANSFORM([grub-reboot])
@@ -32,7 +37,7 @@ index d5db2803e..056df1cba 100644
  grub_TRANSFORM([grub-script-check])
  grub_TRANSFORM([grub-set-default])
  grub_TRANSFORM([grub-sparc64-setup])
-@@ -88,6 +89,7 @@ grub_TRANSFORM([grub-mkrescue.1])
+@@ -95,6 +96,7 @@ grub_TRANSFORM([grub-mkrescue.1])
  grub_TRANSFORM([grub-mkstandalone.3])
  grub_TRANSFORM([grub-ofpathname.3])
  grub_TRANSFORM([grub-probe.3])
@@ -40,14 +45,14 @@ index d5db2803e..056df1cba 100644
  grub_TRANSFORM([grub-reboot.3])
  grub_TRANSFORM([grub-render-label.3])
  grub_TRANSFORM([grub-script-check.3])
-@@ -1790,6 +1792,33 @@ fi
+@@ -1860,6 +1862,42 @@ fi
  
  AC_SUBST([LIBDEVMAPPER])
  
 +AC_ARG_ENABLE([rpm-sort],
 +              [AS_HELP_STRING([--enable-rpm-sort],
 +                              [enable native rpm sorting of kernels in grub (default=guessed)])])
-+if test x"$enable_rpm-sort" = xno ; then
++if test x"$enable_rpm_sort" = xno ; then
 +  rpm_sort_excuse="explicitly disabled"
 +fi
 +
@@ -69,16 +74,25 @@ index d5db2803e..056df1cba 100644
 +             [Define to 1 if you have the rpm library.])
 +fi
 +
++if test x"$LIBRPM" = x ; then
++  # Check for rpm library.
++  AC_CHECK_LIB([rpmio], [rpmvercmp], [],
++               [rpm_sort_excuse="rpmio missing rpmvercmp"])
++   LIBRPM="-lrpmio";
++   AC_DEFINE([HAVE_RPMIO], [1],
++             [Define to 1 if you have the rpm library.])
++fi
++
 +AC_SUBST([LIBRPM])
 +
  LIBGEOM=
  if test x$host_kernel = xkfreebsd; then
    AC_CHECK_LIB([geom], [geom_gettree], [],
 diff --git a/Makefile.util.def b/Makefile.util.def
-index d08713b55..406d96861 100644
+index 2c9b283a230..ba4cf4b29b0 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -685,6 +685,22 @@ program = {
+@@ -703,6 +703,22 @@ program = {
    ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  };
  
@@ -93,8 +107,8 @@ index d08713b55..406d96861 100644
 +  common = util/misc.c;
 +  common = util/grub-rpm-sort.c;
 +
-+  ldadd = grub-core/gnulib/libgnu.a;
 +  ldadd = libgrubkern.a;
++  ldadd = grub-core/lib/gnulib/libgnu.a;
 +  ldadd = '$(LIBDEVMAPPER) $(LIBRPM)';
 +};
 +
@@ -103,7 +117,7 @@ index d08713b55..406d96861 100644
    common = util/grub-mkconfig.in;
 diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c
 new file mode 100644
-index 000000000..f33bd1ed5
+index 00000000000..f33bd1ed568
 --- /dev/null
 +++ b/util/grub-rpm-sort.c
 @@ -0,0 +1,281 @@
@@ -388,37 +402,34 @@ index 000000000..f33bd1ed5
 +
 +  return 0;
 +}
-diff --git a/.gitignore b/.gitignore
-index 43f04d472..fa2e5b609 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -105,6 +105,8 @@ grub-*.tar.*
- /grub*-reboot.8
- /grub*-render-label
- /grub*-render-label.1
-+/grub*-rpm-sort
-+/grub*-rpm-sort.8
- /grub*-script-check
- /grub*-script-check.1
- /grub*-set-default
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 1a4a57898..7fe359843 100644
+index 0f6505bf3b6..42c2ea9ba50 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
-@@ -214,6 +214,12 @@ version_sort ()
+@@ -33,6 +33,9 @@ fi
+ if test "x$grub_mkrelpath" = x; then
+   grub_mkrelpath="${bindir}/@grub_mkrelpath@"
+ fi
++if test "x$grub_rpm_sort" = x; then
++  grub_rpm_sort="${sbindir}/@grub_rpm_sort@"
++fi
+ 
+ if command -v gettext >/dev/null; then
+   :
+@@ -218,6 +221,12 @@ version_sort ()
     esac
  }
  
-+if [ "x$RPMLIB" = x ]; then
-+  kernel_sort=version_sort
++if [ "x$grub_rpm_sort" != x -a -x "$grub_rpm_sort" ]; then
++  kernel_sort="$grub_rpm_sort"
 +else
-+  kernel_sort="${sbindir}/grub-rpm-sort"
++  kernel_sort=version_sort
 +fi
 +
  version_test_numeric ()
  {
    version_test_numeric_a="$1"
-@@ -230,7 +236,7 @@ version_test_numeric ()
+@@ -234,7 +243,7 @@ version_test_numeric ()
      version_test_numeric_a="$version_test_numeric_b"
      version_test_numeric_b="$version_test_numeric_c"
    fi
@@ -429,7 +440,7 @@ index 1a4a57898..7fe359843 100644
      return 1
 diff --git a/util/grub-rpm-sort.8 b/util/grub-rpm-sort.8
 new file mode 100644
-index 000000000..8ce214884
+index 00000000000..8ce21488448
 --- /dev/null
 +++ b/util/grub-rpm-sort.8
 @@ -0,0 +1,12 @@

SOURCES/0047-Make-grub2-mkconfig-construct-titles-that-look-like-.patch

@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 27 insertions(+), 7 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 43d98476b..a8a8e2cf3 100644
+index fed73271478..2e59f3b4197 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -78,6 +78,32 @@ case x"$GRUB_FS" in

SOURCES/0048-Add-friendly-grub2-password-config-tool-985962.patch

@@ -8,36 +8,41 @@ without having to alter the grub.cfg. The hashed password now
 lives in a root-only-readable configuration file.
 
 Resolves: rhbz#985962
+
+Signed-off-by: Robert Marshall <rmarshall@redhat.com>
+[pjones: fix the efidir in grub-setpassword and rename tool]
+Signed-off-by: Peter Jones <pjones@redhat.com>
+[luto: fix grub-setpassword -o's output path]
+Andy Lutomirski <luto@kernel.org>
 ---
- configure.ac             |   1 +
- Makefile.util.def        |  13 +++++
- .gitignore               |   2 +
- util/grub-mkconfig.in    |   2 +
- util/grub-setpassword.8  |  28 +++++++++++
- util/grub-setpassword.in | 123 +++++++++++++++++++++++++++++++++++++++++++++++
- util/grub.d/01_users.in  |  11 +++++
- 7 files changed, 180 insertions(+)
- create mode 100644 util/grub-setpassword.8
- create mode 100644 util/grub-setpassword.in
+ configure.ac              |   1 +
+ Makefile.util.def         |  13 +++++
+ util/grub-mkconfig.in     |   2 +
+ util/grub-set-password.8  |  28 ++++++++++
+ util/grub-set-password.in | 128 ++++++++++++++++++++++++++++++++++++++++++++++
+ util/grub.d/01_users.in   |  11 ++++
+ 6 files changed, 183 insertions(+)
+ create mode 100644 util/grub-set-password.8
+ create mode 100644 util/grub-set-password.in
  create mode 100644 util/grub.d/01_users.in
 
 diff --git a/configure.ac b/configure.ac
-index 056df1cba..679f634ce 100644
+index fdcb452581c..30fd84d8067 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -65,6 +65,7 @@ grub_TRANSFORM([grub-mkrelpath])
+@@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
  grub_TRANSFORM([grub-mkrescue])
  grub_TRANSFORM([grub-probe])
  grub_TRANSFORM([grub-reboot])
-+grub_TRANSFORM([grub-setpassword])
++grub_TRANSFORM([grub-set-password])
  grub_TRANSFORM([grub-rpm-sort])
  grub_TRANSFORM([grub-script-check])
  grub_TRANSFORM([grub-set-default])
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 406d96861..fd91045bd 100644
+index ba4cf4b29b0..1a7dd433e33 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -440,6 +440,12 @@ script = {
+@@ -452,6 +452,12 @@ script = {
    installdir = grubconf;
  };
  
@@ -50,13 +55,13 @@ index 406d96861..fd91045bd 100644
  script = {
    name = '10_windows';
    common = util/grub.d/10_windows.in;
-@@ -722,6 +728,13 @@ script = {
+@@ -740,6 +746,13 @@ script = {
    installdir = sbin;
  };
  
 +script = {
-+  name = grub-setpassword;
-+  common = util/grub-setpassword.in;
++  name = grub-set-password;
++  common = util/grub-set-password.in;
 +  mansection = 8;
 +  installdir = sbin;
 +};
@@ -64,24 +69,11 @@ index 406d96861..fd91045bd 100644
  script = {
    name = grub-mkconfig_lib;
    common = util/grub-mkconfig_lib.in;
-diff --git a/.gitignore b/.gitignore
-index fa2e5b609..5066689bc 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -111,6 +111,8 @@ grub-*.tar.*
- /grub*-script-check.1
- /grub*-set-default
- /grub*-set-default.8
-+/grub*-setsetpassword
-+/grub*-setsetpassword.8
- /grub*-shell
- /grub*-shell-tester
- /grub*-sparc64-setup
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index f68d4925e..bdb9982ae 100644
+index 8ea2315ebc2..ba14cf6261c 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -282,6 +282,8 @@ for i in "${grub_mkconfig_dir}"/* ; do
+@@ -276,6 +276,8 @@ for i in "${grub_mkconfig_dir}"/* ; do
      *~) ;;
      # emacsen autosave files. FIXME: support other editors
      */\#*\#) ;;
@@ -90,21 +82,21 @@ index f68d4925e..bdb9982ae 100644
      *)
        if grub_file_is_not_garbage "$i" && test -x "$i" ; then
          echo
-diff --git a/util/grub-setpassword.8 b/util/grub-setpassword.8
+diff --git a/util/grub-set-password.8 b/util/grub-set-password.8
 new file mode 100644
-index 000000000..49200a848
+index 00000000000..9646546e43d
 --- /dev/null
-+++ b/util/grub-setpassword.8
++++ b/util/grub-set-password.8
 @@ -0,0 +1,28 @@
-+.TH GRUB-SETPASSWORD 3 "Thu Jun 25 2015"
++.TH GRUB-SET-PASSWORD 3 "Thu Jun 25 2015"
 +.SH NAME
-+\fBgrub-setpassword\fR \(em Generate the user.cfg file containing the hashed grub bootloader password.
++\fBgrub-set-password\fR \(em Generate the user.cfg file containing the hashed grub bootloader password.
 +
 +.SH SYNOPSIS
-+\fBgrub-setpassword\fR [OPTION]
++\fBgrub-set-password\fR [OPTION]
 +
 +.SH DESCRIPTION
-+\fBgrub-setpassword\fR outputs the user.cfg file which contains the hashed GRUB bootloader password. This utility only supports configurations where there is a single root user.
++\fBgrub-set-password\fR outputs the user.cfg file which contains the hashed GRUB bootloader password. This utility only supports configurations where there is a single root user.
 +
 +The file has the format:
 +GRUB2_PASSWORD=<\fIhashed password\fR>.
@@ -117,23 +109,24 @@ index 000000000..49200a848
 +-v, --version
 +Display the current version.
 +.TP
-+-o, --output[=\fIDIRECTORY PATH\fR]
++-o, --output=<\fIDIRECTORY\fR>
 +Choose the file path to which user.cfg will be written.
 +
 +.SH SEE ALSO
 +.BR "info grub"
 +
 +.BR "info grub2-mkpasswd-pbkdf2"
-diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
+diff --git a/util/grub-set-password.in b/util/grub-set-password.in
 new file mode 100644
-index 000000000..dd76f00fc
+index 00000000000..5ebf50576d6
 --- /dev/null
-+++ b/util/grub-setpassword.in
-@@ -0,0 +1,123 @@
++++ b/util/grub-set-password.in
+@@ -0,0 +1,128 @@
 +#!/bin/sh -e
 +
++EFIDIR=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')
 +if [ -d /sys/firmware/efi/efivars/ ]; then
-+    grubdir=`echo "/@bootdirname@/efi/EFI/redhat/" | sed 's,//*,/,g'`
++    grubdir=`echo "/@bootdirname@/efi/EFI/${EFIDIR}/" | sed 's,//*,/,g'`
 +else
 +    grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`
 +fi
@@ -148,15 +141,14 @@ index 000000000..dd76f00fc
 +# Print the usage.
 +usage () {
 +    cat <<EOF
-+Usage: $0 [OPTION] [SOURCE]
-+Run GRUB script in a Qemu instance.
-+
-+  -h, --help              print this message and exit
-+  -v, --version           print the version information and exit
-+  -o, --output_path       choose a custom output path for user.cfg
-+
++Usage: $0 [OPTION]
 +$0 prompts the user to set a password on the grub bootloader. The password
-+is written to a file named user.cfg.
++is written to a file named user.cfg which lives in the GRUB directory
++located by default at ${grubdir}.
++
++  -h, --help                     print this message and exit
++  -v, --version                  print the version information and exit
++  -o, --output_path <DIRECTORY>  put user.cfg in a user-selected directory
 +
 +Report bugs at https://bugzilla.redhat.com.
 +EOF
@@ -237,7 +229,7 @@ index 000000000..dd76f00fc
 +    P1="$1" && shift
 +
 +    ( echo ${P0} ; echo ${P1} ) | \
-+        ${grub_mkpasswd} | \
++        LC_ALL=C ${grub_mkpasswd} | \
 +        grep -v '[eE]nter password:' | \
 +        sed -e "s/PBKDF2 hash of your password is //"
 +}
@@ -250,12 +242,17 @@ index 000000000..dd76f00fc
 +
 +# on the ESP, these will fail to set the permissions, but it's okay because
 +# the directory is protected.
-+install -m 0600 /dev/null "${grubdir}/user.cfg" 2>/dev/null || :
-+chmod 0600 "${grubdir}/user.cfg" 2>/dev/null || :
-+echo "GRUB2_PASSWORD=${MYPASS}" > "${grubdir}/user.cfg"
++install -m 0600 /dev/null "${OUTPUT_PATH}/user.cfg" 2>/dev/null || :
++chmod 0600 "${OUTPUT_PATH}/user.cfg" 2>/dev/null || :
++echo "GRUB2_PASSWORD=${MYPASS}" > "${OUTPUT_PATH}/user.cfg"
++
++if ! grep -q "^### BEGIN /etc/grub.d/01_users ###$" "${OUTPUT_PATH}/grub.cfg"; then
++    echo "WARNING: The current configuration lacks password support!"
++    echo "Update your configuration with @grub_mkconfig@ to support this feature."
++fi
 diff --git a/util/grub.d/01_users.in b/util/grub.d/01_users.in
 new file mode 100644
-index 000000000..db2f44bfb
+index 00000000000..db2f44bfb78
 --- /dev/null
 +++ b/util/grub.d/01_users.in
 @@ -0,0 +1,11 @@

SOURCES/0049-tcp-add-window-scaling-support.patch

@@ -17,7 +17,7 @@ Signed-off-by: Josef Bacik <jbacik@fb.com>
  1 file changed, 29 insertions(+), 13 deletions(-)
 
 diff --git a/grub-core/net/tcp.c b/grub-core/net/tcp.c
-index e8ad34b84..7d4b82262 100644
+index e8ad34b84d4..7d4b822626d 100644
 --- a/grub-core/net/tcp.c
 +++ b/grub-core/net/tcp.c
 @@ -106,6 +106,18 @@ struct tcphdr

SOURCES/0050-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch

@@ -1,111 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 6 Mar 2014 11:51:33 -0500
-Subject: [PATCH] Try mac/guid/etc before grub.cfg on tftp config files.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/normal/main.c | 80 ++++++++++++++++++++++++++-----------------------
- 1 file changed, 43 insertions(+), 37 deletions(-)
-
-diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index a3713efcd..7d9c4f09b 100644
---- a/grub-core/normal/main.c
-+++ b/grub-core/normal/main.c
-@@ -341,53 +341,59 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
-       /* Guess the config filename. It is necessary to make CONFIG static,
- 	 so that it won't get broken by longjmp.  */
-       char *config;
--      const char *prefix, *fw_path;
--
--      prefix = fw_path = grub_env_get ("fw_path");
--      if (fw_path)
--	{
--	  config = grub_xasprintf ("%s/grub.cfg", fw_path);
--	  if (config)
--	    {
--	      grub_file_t file;
--
--	      file = grub_file_open (config);
--	      if (file)
--		{
--		  grub_file_close (file);
--		  grub_enter_normal_mode (config);
--		}
--              else
--                {
--                  /*  Ignore all errors.  */
--                  grub_errno = 0;
--                }
--	      grub_free (config);
--	    }
--	}
-+      const char *prefix;
- 
-+      prefix = grub_env_get ("fw_path");
-       if (! prefix)
- 	      prefix = grub_env_get ("prefix");
-+
-       if (prefix)
--        {
--          grub_size_t config_len;
--          config_len = grub_strlen (prefix) +
--                      sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
--          config = grub_malloc (config_len);
-+	{
-+	  if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0)
-+	    {
-+	      grub_size_t config_len;
-+	      config_len = grub_strlen (prefix) +
-+		sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
-+	      config = grub_malloc (config_len);
- 
--          if (! config)
--            goto quit;
-+	      if (! config)
-+		goto quit;
- 
--          grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
-+	      grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
- 
--          if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0)
--            grub_net_search_configfile (config);
-+	      grub_net_search_configfile (config);
- 
--	  grub_enter_normal_mode (config);
--	  grub_free (config);
-+	      grub_enter_normal_mode (config);
-+	      grub_free (config);
-+	      config = NULL;
-+	    }
-+
-+	  if (!config)
-+	    {
-+	      config = grub_xasprintf ("%s/grub.cfg", prefix);
-+	      if (config)
-+		{
-+		  grub_file_t file;
-+
-+		  file = grub_file_open (config);
-+		  if (file)
-+		    {
-+		      grub_file_close (file);
-+		      grub_enter_normal_mode (config);
-+		    }
-+		  else
-+		    {
-+		      /*  Ignore all errors.  */
-+		      grub_errno = 0;
-+		    }
-+		  grub_free (config);
-+		}
-+	    }
- 	}
-       else
--	grub_enter_normal_mode (0);
-+	{
-+	  grub_enter_normal_mode (0);
-+	}
-     }
-   else
-     grub_enter_normal_mode (argv[0]);

SOURCES/0050-efinet-and-bootp-add-support-for-dhcpv6.patch

@@ -1,33 +1,25 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
-Date: Wed, 8 Jun 2016 21:03:37 -0400
+Date: Tue, 9 Jul 2019 11:47:37 +0200
 Subject: [PATCH] efinet and bootp: add support for dhcpv6
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- grub-core/net/bootp.c              | 174 +++++++++++++++++++++++++++++++++++++
- grub-core/net/drivers/efi/efinet.c |  53 +++++++++--
+ grub-core/net/bootp.c              | 173 +++++++++++++++++++++++++++++++++++++
+ grub-core/net/drivers/efi/efinet.c |  53 ++++++++++--
  grub-core/net/net.c                |  72 +++++++++++++++
  grub-core/net/tftp.c               |   4 +
  include/grub/efi/api.h             | 129 +++++++++++++++++++++++++--
  include/grub/net.h                 |  60 +++++++++++++
- 6 files changed, 478 insertions(+), 14 deletions(-)
+ 6 files changed, 477 insertions(+), 14 deletions(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index f03eeab2f..da3e45446 100644
+index 6fb5627025d..e28fb6a09f9 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
-@@ -23,6 +23,7 @@
- #include <grub/net/ip.h>
- #include <grub/net/netbuff.h>
- #include <grub/net/udp.h>
-+#include <grub/net/url.h>
- #include <grub/datetime.h>
+@@ -902,6 +902,179 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
  
- static char *
-@@ -349,6 +350,179 @@ grub_net_configure_by_dhcp_ack (const char *name,
-   return inter;
- }
+ static grub_command_t cmd_getdhcp, cmd_bootp, cmd_dhcp;
  
 +struct grub_net_network_level_interface *
 +grub_net_configure_by_dhcpv6_ack (const char *name,
@@ -203,19 +195,18 @@ index f03eeab2f..da3e45446 100644
 +
 +
  void
- grub_net_process_dhcp (struct grub_net_buff *nb,
- 		       struct grub_net_card *card)
+ grub_bootp_init (void)
+ {
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 5388f952b..a4daaa460 100644
+index 5388f952ba9..173fb63153c 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
-@@ -18,11 +18,15 @@
+@@ -18,11 +18,14 @@
  
  #include <grub/net/netbuff.h>
  #include <grub/dl.h>
 +#include <grub/env.h>
  #include <grub/net.h>
-+#include <grub/net/url.h>
  #include <grub/time.h>
  #include <grub/efi/api.h>
  #include <grub/efi/efi.h>
@@ -225,7 +216,7 @@ index 5388f952b..a4daaa460 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -329,7 +333,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -329,7 +332,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  			  char **path)
  {
    struct grub_net_card *card;
@@ -234,13 +225,14 @@ index 5388f952b..a4daaa460 100644
  
    dp = grub_efi_get_device_path (hnd);
    if (! dp)
-@@ -340,14 +344,18 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -340,14 +343,19 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
      grub_efi_device_path_t *cdp;
      struct grub_efi_pxe *pxe;
      struct grub_efi_pxe_mode *pxe_mode;
 +
      if (card->driver != &efidriver)
        continue;
++
      cdp = grub_efi_get_device_path (card->efi_handle);
      if (! cdp)
        continue;
@@ -315,10 +307,10 @@ index 5388f952b..a4daaa460 100644
    }
  }
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 16d2ce06d..4be228d95 100644
+index 0ef148f4adc..22f2689aaeb 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
-@@ -955,6 +955,78 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
+@@ -960,6 +960,78 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
    grub_net_network_level_interfaces = inter;
  }
  
@@ -398,19 +390,18 @@ index 16d2ce06d..4be228d95 100644
  grub_err_t
  grub_net_add_ipv4_local (struct grub_net_network_level_interface *inter,
 diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index 7d90bf66e..1157524fc 100644
+index 7f44b30f521..4ab2f5c7357 100644
 --- a/grub-core/net/tftp.c
 +++ b/grub-core/net/tftp.c
-@@ -379,19 +379,23 @@ tftp_open (struct grub_file *file, const char *filename)
-       return grub_errno;
-     }
+@@ -358,18 +358,22 @@ tftp_open (struct grub_file *file, const char *filename)
+   file->not_easily_seekable = 1;
+   file->data = data;
  
 +  grub_dprintf("tftp", "resolving address for %s\n", file->device->net->server);
    err = grub_net_resolve_address (file->device->net->server, &addr);
    if (err)
      {
 +      grub_dprintf("tftp", "Address resolution failed: %d\n", err);
-       destroy_pq (data);
        grub_free (data);
        return err;
      }
@@ -422,14 +413,14 @@ index 7d90bf66e..1157524fc 100644
    if (!data->sock)
      {
 +      grub_dprintf("tftp", "connection failed\n");
-       destroy_pq (data);
        grub_free (data);
        return grub_errno;
+     }
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index c7c9f0e1d..28b6adf76 100644
+index f1a52210c0c..117469450d3 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -572,10 +572,16 @@ typedef void *grub_efi_handle_t;
+@@ -592,10 +592,16 @@ typedef void *grub_efi_handle_t;
  typedef void *grub_efi_event_t;
  typedef grub_efi_uint64_t grub_efi_lba_t;
  typedef grub_efi_uintn_t grub_efi_tpl_t;
@@ -450,7 +441,7 @@ index c7c9f0e1d..28b6adf76 100644
  typedef grub_efi_uint64_t grub_efi_physical_address_t;
  typedef grub_efi_uint64_t grub_efi_virtual_address_t;
  
-@@ -1450,16 +1456,127 @@ struct grub_efi_simple_text_output_interface
+@@ -1474,16 +1480,127 @@ struct grub_efi_simple_text_output_interface
  };
  typedef struct grub_efi_simple_text_output_interface grub_efi_simple_text_output_interface_t;
  
@@ -581,10 +572,10 @@ index c7c9f0e1d..28b6adf76 100644
  
  typedef struct grub_efi_pxe
 diff --git a/include/grub/net.h b/include/grub/net.h
-index 50d62ab0c..f8f3ec13a 100644
+index 7ae4b6bd805..8a05ec4fe7a 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
-@@ -442,6 +442,51 @@ struct grub_net_bootp_packet
+@@ -447,6 +447,51 @@ struct grub_net_bootp_packet
    grub_uint8_t vendor[0];
  } GRUB_PACKED;
  
@@ -636,7 +627,7 @@ index 50d62ab0c..f8f3ec13a 100644
  #define	GRUB_NET_BOOTP_RFC1048_MAGIC_0	0x63
  #define	GRUB_NET_BOOTP_RFC1048_MAGIC_1	0x82
  #define	GRUB_NET_BOOTP_RFC1048_MAGIC_2	0x53
-@@ -470,6 +515,21 @@ grub_net_configure_by_dhcp_ack (const char *name,
+@@ -482,6 +527,21 @@ grub_net_configure_by_dhcp_ack (const char *name,
  				grub_size_t size,
  				int is_def, char **device, char **path);
  

SOURCES/0051-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch

@@ -12,22 +12,21 @@ debug stanzas.
 Resolves: rhbz#1226325
 ---
  configure.ac                                   |  2 +
- Makefile.util.def                              |  7 +++
- .gitignore                                     |  2 +
- util/bash-completion.d/grub-completion.bash.in | 22 ++++++++
- util/grub-get-kernel-settings.3                | 20 +++++++
- util/grub-get-kernel-settings.in               | 78 ++++++++++++++++++++++++++
+ Makefile.util.def                              |  7 ++
+ util/bash-completion.d/grub-completion.bash.in | 22 +++++++
+ util/grub-get-kernel-settings.3                | 20 ++++++
+ util/grub-get-kernel-settings.in               | 88 ++++++++++++++++++++++++++
  util/grub-mkconfig.in                          |  3 +
- util/grub.d/10_linux.in                        | 23 ++++++--
- 8 files changed, 152 insertions(+), 5 deletions(-)
+ util/grub.d/10_linux.in                        | 23 +++++--
+ 7 files changed, 160 insertions(+), 5 deletions(-)
  create mode 100644 util/grub-get-kernel-settings.3
  create mode 100644 util/grub-get-kernel-settings.in
 
 diff --git a/configure.ac b/configure.ac
-index 71d105696..aa06ed59c 100644
+index 30fd84d8067..ed31ea457d2 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -58,6 +58,7 @@ grub_TRANSFORM([grub-install])
+@@ -65,6 +65,7 @@ grub_TRANSFORM([grub-install])
  grub_TRANSFORM([grub-mkconfig])
  grub_TRANSFORM([grub-mkfont])
  grub_TRANSFORM([grub-mkimage])
@@ -35,7 +34,7 @@ index 71d105696..aa06ed59c 100644
  grub_TRANSFORM([grub-glue-efi])
  grub_TRANSFORM([grub-mklayout])
  grub_TRANSFORM([grub-mkpasswd-pbkdf2])
-@@ -75,6 +76,7 @@ grub_TRANSFORM([grub-file])
+@@ -82,6 +83,7 @@ grub_TRANSFORM([grub-file])
  grub_TRANSFORM([grub-bios-setup.3])
  grub_TRANSFORM([grub-editenv.1])
  grub_TRANSFORM([grub-fstest.3])
@@ -44,10 +43,10 @@ index 71d105696..aa06ed59c 100644
  grub_TRANSFORM([grub-install.1])
  grub_TRANSFORM([grub-kbdcomp.3])
 diff --git a/Makefile.util.def b/Makefile.util.def
-index fd91045bd..2d032643d 100644
+index 1a7dd433e33..cdd2f51fe4b 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -714,6 +714,13 @@ script = {
+@@ -732,6 +732,13 @@ script = {
    installdir = sbin;
  };
  
@@ -61,21 +60,8 @@ index fd91045bd..2d032643d 100644
  script = {
    name = grub-set-default;
    common = util/grub-set-default.in;
-diff --git a/.gitignore b/.gitignore
-index 5066689bc..54795fa60 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -68,6 +68,8 @@ grub-*.tar.*
- /grub*-fs-tester
- /grub*-fstest
- /grub*-fstest.1
-+/grub*-get-kernel-settings
-+/grub*-get-kernel-settings.3
- /grub*-glue-efi
- /grub*-glue-efi.1
- /grub*-install
 diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in
-index 44bf135b9..5c4acd496 100644
+index 44bf135b9f8..5c4acd496d4 100644
 --- a/util/bash-completion.d/grub-completion.bash.in
 +++ b/util/bash-completion.d/grub-completion.bash.in
 @@ -264,6 +264,28 @@ have ${__grub_sparc64_setup_program} && \
@@ -109,7 +95,7 @@ index 44bf135b9..5c4acd496 100644
  #
 diff --git a/util/grub-get-kernel-settings.3 b/util/grub-get-kernel-settings.3
 new file mode 100644
-index 000000000..ba33330e2
+index 00000000000..ba33330e28d
 --- /dev/null
 +++ b/util/grub-get-kernel-settings.3
 @@ -0,0 +1,20 @@
@@ -135,10 +121,10 @@ index 000000000..ba33330e2
 +.BR "info grub"
 diff --git a/util/grub-get-kernel-settings.in b/util/grub-get-kernel-settings.in
 new file mode 100644
-index 000000000..120462198
+index 00000000000..7e87dfccc0e
 --- /dev/null
 +++ b/util/grub-get-kernel-settings.in
-@@ -0,0 +1,78 @@
+@@ -0,0 +1,88 @@
 +#!/bin/sh
 +set -e
 +
@@ -217,8 +203,18 @@ index 000000000..120462198
 +    echo GRUB_LINUX_DEBUG_TITLE_POSTFIX=\" with debugging\"
 +    echo export GRUB_LINUX_DEBUG_TITLE_POSTFIX
 +fi
++if [ "$DEFAULTDEBUG" = "yes" ]; then
++    echo GRUB_DEFAULT_TO_DEBUG=true
++else
++    echo GRUB_DEFAULT_TO_DEBUG=false
++fi
++echo export GRUB_DEFAULT_TO_DEBUG
++if [ "$UPDATEDEFAULT" = "yes" ]; then
++    echo GRUB_UPDATE_DEFAULT_KERNEL=true
++    echo export GRUB_UPDATE_DEFAULT_KERNEL
++fi
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index bdb9982ae..8218f3d47 100644
+index ba14cf6261c..005f093809b 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -45,6 +45,7 @@ grub_probe="${sbindir}/@grub_probe@"
@@ -235,11 +231,11 @@ index bdb9982ae..8218f3d47 100644
  
 +eval "$("${grub_get_kernel_settings}")" || true
 +
- if [ "x$GRUB_DISABLE_UUID" != "xtrue" ]; then
-   if [ -z "$GRUB_DEVICE_UUID" ]; then
-     GRUB_DEVICE_UUID="$GRUB_DEVICE_UUID_GENERATED"
+ if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
+   if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then
+     GRUB_DISABLE_LINUX_UUID="true"
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index a8a8e2cf3..4e49ccdf7 100644
+index 2e59f3b4197..0f3c19e30cc 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -111,7 +111,8 @@ linux_entry ()
@@ -262,7 +258,7 @@ index a8a8e2cf3..4e49ccdf7 100644
        echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
    else
        echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
-@@ -295,11 +299,15 @@ while [ "x$list" != "x" ] ; do
+@@ -299,11 +303,15 @@ while [ "x$list" != "x" ] ; do
    fi
  
    if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
@@ -280,7 +276,7 @@ index a8a8e2cf3..4e49ccdf7 100644
      if [ -z "$boot_device_id" ]; then
  	boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
      fi
-@@ -308,10 +316,15 @@ while [ "x$list" != "x" ] ; do
+@@ -312,10 +320,15 @@ while [ "x$list" != "x" ] ; do
      is_top_level=false
    fi
  

SOURCES/0051-Fix-convert-function-to-support-NVMe-devices.patch

@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 18 Feb 2014 11:34:00 -0500
-Subject: [PATCH] Fix convert function to support NVMe devices
-
-This is adapted from the patch at
-https://bugzilla.redhat.com/show_bug.cgi?id=1019660 , which is against
-the now very old version of convert_system_partition_to_system_disk().
-
-As such, it certainly not the right thing for upstream, but should
-function for now.
-
-Resolves: rhbz#1019660
-
-Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
----
- util/getroot.c | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/util/getroot.c b/util/getroot.c
-index 847406fba..fa3460d6c 100644
---- a/util/getroot.c
-+++ b/util/getroot.c
-@@ -153,6 +153,7 @@ convert_system_partition_to_system_disk (const char *os_dev, int *is_part)
- {
- #if GRUB_UTIL_FD_STAT_IS_FUNCTIONAL
-   struct stat st;
-+  char *path = xmalloc(PATH_MAX);
- 
-   if (stat (os_dev, &st) < 0)
-     {
-@@ -165,6 +166,24 @@ convert_system_partition_to_system_disk (const char *os_dev, int *is_part)
- 
-   *is_part = 0;
- 
-+  if (realpath(os_dev, path))
-+    {
-+      if ((strncmp ("/dev/nvme", path, 9) == 0))
-+	{
-+	  char *p = path + 5;
-+	  p = strchr(p, 'p');
-+	  if (p)
-+	    {
-+	      *is_part = 1;
-+	      *p = '\0';
-+	    }
-+	  return path;
-+	}
-+    }
-+
-+  grub_free (path);
-+  *is_part = 0;
-+
-   if (grub_util_device_is_mapped_stat (&st))
-     return grub_util_devmapper_part_to_disk (&st, is_part, os_dev);
- 

SOURCES/0052-bz1374141-fix-incorrect-mask-for-ppc64.patch

@@ -30,7 +30,7 @@ The count of zero with __builtin_clz can be 22. (clz counts the number of one bi
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
-index 002446be1..3df75357a 100644
+index ac4e62a95c9..3860b6f78d8 100644
 --- a/grub-core/net/drivers/ieee1275/ofnet.c
 +++ b/grub-core/net/drivers/ieee1275/ofnet.c
 @@ -220,8 +220,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,

SOURCES/0052-reopen-SNP-protocol-for-exclusive-use-by-grub.patch

@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fedora Ninjas <grub2-owner@fedoraproject.org>
-Date: Sat, 15 Feb 2014 15:10:22 -0500
-Subject: [PATCH] reopen SNP protocol for exclusive use by grub
-
----
- grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 5388f952b..ea0e0ca36 100644
---- a/grub-core/net/drivers/efi/efinet.c
-+++ b/grub-core/net/drivers/efi/efinet.c
-@@ -330,6 +330,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
- {
-   struct grub_net_card *card;
-   grub_efi_device_path_t *dp;
-+  grub_efi_simple_network_t *net;
- 
-   dp = grub_efi_get_device_path (hnd);
-   if (! dp)
-@@ -383,6 +384,21 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
- 				    &pxe_mode->dhcp_ack,
- 				    sizeof (pxe_mode->dhcp_ack),
- 				    1, device, path);
-+    net = grub_efi_open_protocol (card->efi_handle, &net_io_guid,
-+				  GRUB_EFI_OPEN_PROTOCOL_BY_EXCLUSIVE);
-+    if (net) {
-+      if (net->mode->state == GRUB_EFI_NETWORK_STOPPED
-+	  && efi_call_1 (net->start, net) != GRUB_EFI_SUCCESS)
-+	continue;
-+
-+      if (net->mode->state == GRUB_EFI_NETWORK_STOPPED)
-+	continue;
-+
-+      if (net->mode->state == GRUB_EFI_NETWORK_STARTED
-+	  && efi_call_3 (net->initialize, net, 0, 0) != GRUB_EFI_SUCCESS)
-+	continue;
-+      card->efi_net = net;
-+    }
-     return;
-   }
- }

SOURCES/0053-Make-grub_fatal-also-backtrace.patch

@@ -13,10 +13,10 @@ Subject: [PATCH] Make grub_fatal() also backtrace.
  create mode 100644 grub-core/lib/arm64/backtrace.c
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 991891a6e..27563743b 100644
+index c15e91943b9..058c88ac3af 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -175,6 +175,9 @@ kernel = {
+@@ -188,6 +188,9 @@ kernel = {
  
    softdiv = lib/division.c;
  
@@ -25,9 +25,9 @@ index 991891a6e..27563743b 100644
 +
    i386 = kern/i386/dl.c;
    i386_xen = kern/i386/dl.c;
- 
+   i386_xen_pvh = kern/i386/dl.c;
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index f1fab7000..5ce89a40c 100644
+index 63b586d09cb..a3e215155bd 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
 @@ -24,6 +24,7 @@
@@ -38,7 +38,7 @@ index f1fab7000..5ce89a40c 100644
  
  union printf_arg
  {
-@@ -1101,8 +1102,13 @@ grub_xasprintf (const char *fmt, ...)
+@@ -1199,8 +1200,13 @@ grub_printf_fmt_check (const char *fmt, const char *fmt_expected)
  static void __attribute__ ((noreturn))
  grub_abort (void)
  {
@@ -55,7 +55,7 @@ index f1fab7000..5ce89a40c 100644
  #endif
 diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c
 new file mode 100644
-index 000000000..1079b5380
+index 00000000000..1079b5380e1
 --- /dev/null
 +++ b/grub-core/lib/arm64/backtrace.c
 @@ -0,0 +1,62 @@
@@ -122,7 +122,7 @@ index 000000000..1079b5380
 +}
 +
 diff --git a/grub-core/lib/backtrace.c b/grub-core/lib/backtrace.c
-index 825a8800e..c0ad6ab8b 100644
+index 825a8800e25..c0ad6ab8be1 100644
 --- a/grub-core/lib/backtrace.c
 +++ b/grub-core/lib/backtrace.c
 @@ -29,6 +29,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
@@ -142,7 +142,7 @@ index 825a8800e..c0ad6ab8b 100644
  }
  
 diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c
-index c3e03c727..c67273db3 100644
+index c3e03c7275c..c67273db3ae 100644
 --- a/grub-core/lib/i386/backtrace.c
 +++ b/grub-core/lib/i386/backtrace.c
 @@ -15,11 +15,23 @@

SOURCES/0053-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch

@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Fri, 4 Mar 2016 15:13:59 -0500
-Subject: [PATCH] Revert "reopen SNP protocol for exclusive use by grub"
-
-This reverts commit a3f2c756ce34c9666bddef35e3b3b85ccecdcffc , which is
-obsoleted by these:
-
-49426e9 efinet: open Simple Network Protocol exclusively
-f348aee efinet: enable hardware filters when opening interface
-c52ae40 efinet: skip virtual IPv4 and IPv6 devices when enumerating cards
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/net/drivers/efi/efinet.c | 16 ----------------
- 1 file changed, 16 deletions(-)
-
-diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index ea0e0ca36..5388f952b 100644
---- a/grub-core/net/drivers/efi/efinet.c
-+++ b/grub-core/net/drivers/efi/efinet.c
-@@ -330,7 +330,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
- {
-   struct grub_net_card *card;
-   grub_efi_device_path_t *dp;
--  grub_efi_simple_network_t *net;
- 
-   dp = grub_efi_get_device_path (hnd);
-   if (! dp)
-@@ -384,21 +383,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
- 				    &pxe_mode->dhcp_ack,
- 				    sizeof (pxe_mode->dhcp_ack),
- 				    1, device, path);
--    net = grub_efi_open_protocol (card->efi_handle, &net_io_guid,
--				  GRUB_EFI_OPEN_PROTOCOL_BY_EXCLUSIVE);
--    if (net) {
--      if (net->mode->state == GRUB_EFI_NETWORK_STOPPED
--	  && efi_call_1 (net->start, net) != GRUB_EFI_SUCCESS)
--	continue;
--
--      if (net->mode->state == GRUB_EFI_NETWORK_STOPPED)
--	continue;
--
--      if (net->mode->state == GRUB_EFI_NETWORK_STARTED
--	  && efi_call_3 (net->initialize, net, 0, 0) != GRUB_EFI_SUCCESS)
--	continue;
--      card->efi_net = net;
--    }
-     return;
-   }
- }

SOURCES/0054-Fix-up-some-man-pages-rpmdiff-noticed.patch

@@ -13,10 +13,10 @@ Subject: [PATCH] Fix up some man pages rpmdiff noticed.
  create mode 100644 util/grub-syslinux2cfg.1
 
 diff --git a/configure.ac b/configure.ac
-index aa06ed59c..f69f89867 100644
+index ed31ea457d2..537ed411469 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -80,6 +80,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3])
+@@ -87,6 +87,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3])
  grub_TRANSFORM([grub-glue-efi.3])
  grub_TRANSFORM([grub-install.1])
  grub_TRANSFORM([grub-kbdcomp.3])
@@ -24,7 +24,7 @@ index aa06ed59c..f69f89867 100644
  grub_TRANSFORM([grub-menulst2cfg.1])
  grub_TRANSFORM([grub-mkconfig.1])
  grub_TRANSFORM([grub-mkfont.3])
-@@ -98,6 +99,7 @@ grub_TRANSFORM([grub-render-label.3])
+@@ -105,6 +106,7 @@ grub_TRANSFORM([grub-render-label.3])
  grub_TRANSFORM([grub-script-check.3])
  grub_TRANSFORM([grub-set-default.1])
  grub_TRANSFORM([grub-sparc64-setup.3])
@@ -34,7 +34,7 @@ index aa06ed59c..f69f89867 100644
  if test "x$TARGET_CFLAGS" = x; then
 diff --git a/util/grub-macbless.8 b/util/grub-macbless.8
 new file mode 100644
-index 000000000..ae842f3a6
+index 00000000000..ae842f3a606
 --- /dev/null
 +++ b/util/grub-macbless.8
 @@ -0,0 +1,26 @@
@@ -65,7 +65,7 @@ index 000000000..ae842f3a6
 +.SH SEE ALSO
 +.BR "info grub"
 diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1
-index 4dea4f545..0eaaafe50 100644
+index 4dea4f54597..0eaaafe505b 100644
 --- a/util/grub-mkimage.1
 +++ b/util/grub-mkimage.1
 @@ -17,7 +17,7 @@
@@ -79,7 +79,7 @@ index 4dea4f545..0eaaafe50 100644
  .TP
 diff --git a/util/grub-syslinux2cfg.1 b/util/grub-syslinux2cfg.1
 new file mode 100644
-index 000000000..853094827
+index 00000000000..85309482718
 --- /dev/null
 +++ b/util/grub-syslinux2cfg.1
 @@ -0,0 +1,65 @@

SOURCES/0055-Make-editenv-chase-symlinks-including-those-across-d.patch

@@ -1,102 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Wed, 3 Sep 2014 10:38:00 -0400
-Subject: [PATCH] Make editenv chase symlinks including those across devices.
-
-This lets us make /boot/grub2/grubenv a symlink to
-/boot/efi/EFI/fedora/grubenv even though they're different mount points,
-which allows /usr/bin/grub2-editenv to be the same across platforms
-(i.e. UEFI vs BIOS).
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
-Reviewed-by: Adam Jackson <ajax@redhat.com>
----
- Makefile.util.def |  9 +++++++++
- util/editenv.c    | 46 ++++++++++++++++++++++++++++++++++++++++++++--
- 2 files changed, 53 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.util.def b/Makefile.util.def
-index c7b775bce..d08713b55 100644
---- a/Makefile.util.def
-+++ b/Makefile.util.def
-@@ -231,8 +231,17 @@ program = {
- 
-   common = util/grub-editenv.c;
-   common = util/editenv.c;
-+  common = util/grub-install-common.c;
-   common = grub-core/osdep/init.c;
-+  common = grub-core/osdep/compress.c;
-+  extra_dist = grub-core/osdep/unix/compress.c;
-+  extra_dist = grub-core/osdep/basic/compress.c;
-+  common = util/mkimage.c;
-+  common = grub-core/osdep/config.c;
-+  common = util/config.c;
-+  common = util/resolve.c;
- 
-+  ldadd = '$(LIBLZMA)';
-   ldadd = libgrubmods.a;
-   ldadd = libgrubgcry.a;
-   ldadd = libgrubkern.a;
-diff --git a/util/editenv.c b/util/editenv.c
-index c6f8d2298..d8d1dad6a 100644
---- a/util/editenv.c
-+++ b/util/editenv.c
-@@ -37,6 +37,7 @@ grub_util_create_envblk_file (const char *name)
-   FILE *fp;
-   char *buf;
-   char *namenew;
-+  char *rename_target = xstrdup(name);
- 
-   buf = xmalloc (DEFAULT_ENVBLK_SIZE);
- 
-@@ -59,7 +60,48 @@ grub_util_create_envblk_file (const char *name)
-   free (buf);
-   fclose (fp);
- 
--  if (grub_util_rename (namenew, name) < 0)
--    grub_util_error (_("cannot rename the file %s to %s"), namenew, name);
-+  ssize_t size = 1;
-+  while (1)
-+    {
-+      char *linkbuf;
-+      ssize_t retsize;
-+
-+      linkbuf = xmalloc(size+1);
-+      retsize = grub_util_readlink (rename_target, linkbuf, size);
-+      if (retsize < 0 && (errno == ENOENT || errno == EINVAL))
-+	{
-+	  free (linkbuf);
-+	  break;
-+	}
-+      else if (retsize < 0)
-+	{
-+	  grub_util_error (_("cannot rename the file %s to %s: %m"), namenew, name);
-+	  free (linkbuf);
-+	  free (namenew);
-+	  return;
-+	}
-+      else if (retsize == size)
-+	{
-+	  free(linkbuf);
-+	  size += 128;
-+	  continue;
-+	}
-+
-+      free (rename_target);
-+      linkbuf[retsize] = '\0';
-+      rename_target = linkbuf;
-+    }
-+
-+  int rc = grub_util_rename (namenew, rename_target);
-+  if (rc < 0 && errno == EXDEV)
-+    {
-+      rc = grub_install_copy_file (namenew, rename_target, 1);
-+      grub_util_unlink (namenew);
-+    }
-+
-+  if (rc < 0)
-+    grub_util_error (_("cannot rename the file %s to %s: %m"), namenew, name);
-+
-   free (namenew);
-+  free (rename_target);
- }

SOURCES/0055-Make-our-info-pages-say-grub2-where-appropriate.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
-Date: Fri, 6 May 2016 18:43:08 -0400
+Date: Tue, 9 Jul 2019 12:59:58 +0200
 Subject: [PATCH] Make our info pages say "grub2" where appropriate.
 
 This needs to be hooked up to --program-transform=, but I haven't had
@@ -9,11 +9,11 @@ time.
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  docs/grub-dev.texi |   4 +-
- docs/grub.texi     | 318 ++++++++++++++++++++++++++---------------------------
- 2 files changed, 161 insertions(+), 161 deletions(-)
+ docs/grub.texi     | 321 ++++++++++++++++++++++++++++-------------------------
+ 2 files changed, 171 insertions(+), 154 deletions(-)
 
 diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
-index a9f4de631..3ce827ab7 100644
+index 6c629a23e2d..19f708ee662 100644
 --- a/docs/grub-dev.texi
 +++ b/docs/grub-dev.texi
 @@ -1,7 +1,7 @@
@@ -35,7 +35,7 @@ index a9f4de631..3ce827ab7 100644
  
  @setchapternewpage odd
 diff --git a/docs/grub.texi b/docs/grub.texi
-index a7155c22f..2b7b7faf8 100644
+index 69f08d289f9..0615d0ed97e 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
 @@ -1,7 +1,7 @@
@@ -212,7 +212,7 @@ index a7155c22f..2b7b7faf8 100644
  # @kbd{umount /mnt}
  @end group
  @end example
-@@ -689,16 +689,16 @@ floppy instead of exposing the USB drive as a hard disk (they call it
+@@ -689,30 +689,37 @@ floppy instead of exposing the USB drive as a hard disk (they call it
  @example
  # @kbd{losetup /dev/loop0 /dev/sdb1}
  # @kbd{mount /dev/loop0 /mnt/usb}
@@ -223,17 +223,14 @@ index a7155c22f..2b7b7faf8 100644
  This install doesn't conflict with standard install as long as they are in
  separate directories.
  
--Note that @command{grub-install} is actually just a shell script and the
--real task is done by other tools such as @command{grub-mkimage}. Therefore,
 +Note that @command{grub2-install} is actually just a shell script and the
 +real task is done by other tools such as @command{grub2-mkimage}. Therefore,
- you may run those commands directly to install GRUB, without using
--@command{grub-install}. Don't do that, however, unless you are very familiar
++you may run those commands directly to install GRUB, without using
 +@command{grub2-install}. Don't do that, however, unless you are very familiar
- with the internals of GRUB. Installing a boot loader on a running OS may be
- extremely dangerous.
- 
-@@ -706,20 +706,20 @@ On EFI systems for fixed disk install you have to mount EFI System Partition.
++with the internals of GRUB. Installing a boot loader on a running OS may be
++extremely dangerous.
++
+ On EFI systems for fixed disk install you have to mount EFI System Partition.
  If you mount it at @file{/boot/efi} then you don't need any special arguments:
  
  @example
@@ -257,7 +254,7 @@ index a7155c22f..2b7b7faf8 100644
  @end example
  
  @node Making a GRUB bootable CD-ROM
-@@ -739,10 +739,10 @@ usually also need to include a configuration file @file{grub.cfg} and some
+@@ -732,10 +739,10 @@ usually also need to include a configuration file @file{grub.cfg} and some
  other GRUB modules.
  
  To make a simple generic GRUB rescue CD, you can use the
@@ -270,7 +267,7 @@ index a7155c22f..2b7b7faf8 100644
  @end example
  
  You will often need to include other files in your image. To do this, first
-@@ -765,7 +765,7 @@ directory @file{iso/}.
+@@ -758,7 +765,7 @@ directory @file{iso/}.
  Finally, make the image:
  
  @example
@@ -279,7 +276,7 @@ index a7155c22f..2b7b7faf8 100644
  @end example
  
  This produces a file named @file{grub.iso}, which then can be burned
-@@ -781,7 +781,7 @@ storage devices.
+@@ -774,7 +781,7 @@ storage devices.
  @node Device map
  @section The map between BIOS drives and OS devices
  
@@ -288,7 +285,7 @@ index a7155c22f..2b7b7faf8 100644
  etc.) read it to map BIOS drives to OS devices.  This file consists of lines
  like this:
  
-@@ -1225,23 +1225,23 @@ need to write the whole thing by hand.
+@@ -1254,23 +1261,23 @@ need to write the whole thing by hand.
  @node Simple configuration
  @section Simple configuration handling
  
@@ -317,7 +314,7 @@ index a7155c22f..2b7b7faf8 100644
  valid POSIX shell input; normally, it will just be a sequence of
  @samp{KEY=value} lines, but if the value contains spaces or other special
  characters then it must be quoted.  For example:
-@@ -1279,7 +1279,7 @@ works it's not recommended since titles often contain unstable device names
+@@ -1308,7 +1315,7 @@ works it's not recommended since titles often contain unstable device names
  and may be translated
  
  If you set this to @samp{saved}, then the default menu entry will be that
@@ -326,7 +323,7 @@ index a7155c22f..2b7b7faf8 100644
  the environment block, which may not be available in all situations
  (@pxref{Environment block}).
  
-@@ -1290,7 +1290,7 @@ If this option is set to @samp{true}, then, when an entry is selected, save
+@@ -1319,7 +1326,7 @@ If this option is set to @samp{true}, then, when an entry is selected, save
  it as a new default entry for use by future runs of GRUB.  This is only
  useful if @samp{GRUB_DEFAULT=saved}; it is a separate option because
  @samp{GRUB_DEFAULT=saved} is useful without this option, in conjunction with
@@ -335,7 +332,7 @@ index a7155c22f..2b7b7faf8 100644
  This option relies on the environment block, which may not be available in
  all situations (@pxref{Environment block}).
  
-@@ -1420,7 +1420,7 @@ intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode
+@@ -1449,7 +1456,7 @@ intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode
  @end example
  
  @item GRUB_DISABLE_LINUX_UUID
@@ -344,7 +341,7 @@ index a7155c22f..2b7b7faf8 100644
  universally-unique identifiers (UUIDs) to identify the root filesystem to
  the Linux kernel, using a @samp{root=UUID=...} kernel parameter.  This is
  usually more reliable, but in some cases it may not be appropriate.  To
-@@ -1442,7 +1442,7 @@ If this option is set to @samp{true}, disable the generation of recovery
+@@ -1471,7 +1478,7 @@ If this option is set to @samp{true}, disable the generation of recovery
  mode menu entries.
  
  @item GRUB_DISABLE_UUID
@@ -353,7 +350,7 @@ index a7155c22f..2b7b7faf8 100644
  universally-unique identifiers (UUIDs) to identify various filesystems to
  search for files.  This is usually more reliable, but in some cases it may
  not be appropriate.  To disable this use of UUIDs, set this option to
-@@ -1451,12 +1451,12 @@ not be appropriate.  To disable this use of UUIDs, set this option to
+@@ -1482,12 +1489,12 @@ not be appropriate.  To disable this use of UUIDs, set this option to
  @item GRUB_VIDEO_BACKEND
  If graphical video support is required, either because the @samp{gfxterm}
  graphical terminal is in use or because @samp{GRUB_GFXPAYLOAD_LINUX} is set,
@@ -369,7 +366,7 @@ index a7155c22f..2b7b7faf8 100644
  
  @item GRUB_GFXMODE
  Set the resolution used on the @samp{gfxterm} graphical terminal.  Note that
-@@ -1488,7 +1488,7 @@ boot sequence.  If you have problems, set this option to @samp{text} and
+@@ -1519,7 +1526,7 @@ boot sequence.  If you have problems, set this option to @samp{text} and
  GRUB will tell Linux to boot in normal text mode.
  
  @item GRUB_DISABLE_OS_PROBER
@@ -378,7 +375,7 @@ index a7155c22f..2b7b7faf8 100644
  @command{os-prober} program, if installed, to discover other operating
  systems installed on the same system and generate appropriate menu entries
  for them.  Set this option to @samp{true} to disable this.
-@@ -1498,7 +1498,7 @@ List of space-separated FS UUIDs of filesystems to be ignored from os-prober
+@@ -1529,7 +1536,7 @@ List of space-separated FS UUIDs of filesystems to be ignored from os-prober
  output. For efi chainloaders it's <UUID>@@<EFI FILE>
  
  @item GRUB_DISABLE_SUBMENU
@@ -387,7 +384,7 @@ index a7155c22f..2b7b7faf8 100644
  the kernel with highest version number and put all other found kernels
  or alternative menu entries for recovery mode in submenu. For entries returned
  by @command{os-prober} first entry will be put on top level and all others
-@@ -1506,11 +1506,11 @@ in submenu. If this option is set to @samp{y}, flat menu with all entries
+@@ -1537,11 +1544,11 @@ in submenu. If this option is set to @samp{true}, flat menu with all entries
  on top level will be generated instead. Changing this option will require
  changing existing values of @samp{GRUB_DEFAULT}, @samp{fallback} (@pxref{fallback})
  and @samp{default} (@pxref{default}) environment variables as well as saved
@@ -402,7 +399,7 @@ index a7155c22f..2b7b7faf8 100644
  check for encrypted disks and generate additional commands needed to access
  them during boot.  Note that in this case unattended boot is not possible
  because GRUB will wait for passphrase to unlock encrypted container.
-@@ -1569,7 +1569,7 @@ confusing @samp{GRUB_TIMEOUT_STYLE=countdown} or
+@@ -1600,7 +1607,7 @@ confusing @samp{GRUB_TIMEOUT_STYLE=countdown} or
  
  @end table
  
@@ -411,7 +408,7 @@ index a7155c22f..2b7b7faf8 100644
  edit the scripts in @file{/etc/grub.d} directly.
  @file{/etc/grub.d/40_custom} is particularly useful for adding entire custom
  menu entries; simply type the menu entries you want to add at the end of
-@@ -1831,7 +1831,7 @@ images as well.
+@@ -1862,7 +1869,7 @@ images as well.
  Mount this partition on/mnt/boot and disable GRUB in all OSes and manually
  install self-compiled latest GRUB with:
  
@@ -420,7 +417,7 @@ index a7155c22f..2b7b7faf8 100644
  
  In all the OSes install GRUB tools but disable installing GRUB in bootsector,
  so you'll have menu.lst and grub.cfg available for use. Also disable os-prober
-@@ -1841,20 +1841,20 @@ use by setting:
+@@ -1872,20 +1879,20 @@ use by setting:
  
  in /etc/default/grub
  
@@ -444,7 +441,7 @@ index a7155c22f..2b7b7faf8 100644
  @}
  
  menuentry "Windows XP" @{
-@@ -1917,15 +1917,15 @@ GRUB supports embedding a configuration file directly into the core image,
+@@ -1948,15 +1955,15 @@ GRUB supports embedding a configuration file directly into the core image,
  so that it is loaded before entering normal mode.  This is useful, for
  example, when it is not straightforward to find the real configuration file,
  or when you need to debug problems with loading that file.
@@ -463,7 +460,7 @@ index a7155c22f..2b7b7faf8 100644
  
  After the embedded configuration file (if any) is executed, GRUB will load
  the @samp{normal} module (@pxref{normal}), which will then read the real
-@@ -1960,13 +1960,13 @@ included in the core image:
+@@ -1991,13 +1998,13 @@ included in the core image:
  @example
  @group
  search.fs_label grub root
@@ -481,7 +478,7 @@ index a7155c22f..2b7b7faf8 100644
      else
          echo "Could not find an example configuration file!"
      fi
-@@ -2490,7 +2490,7 @@ grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i38
+@@ -2521,7 +2528,7 @@ grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i38
  @end group
  @end example
  
@@ -490,7 +487,7 @@ index a7155c22f..2b7b7faf8 100644
  server.
  
  The grub.cfg file is placed in the same directory as the path output by
-@@ -2675,7 +2675,7 @@ team are:
+@@ -2715,7 +2722,7 @@ team are:
  @end table
  
  To take full advantage of this function, install GRUB into the MBR
@@ -499,7 +496,7 @@ index a7155c22f..2b7b7faf8 100644
  
  If you have a laptop which has a similar feature and not in the above list
  could you figure your address and contribute?
-@@ -2736,7 +2736,7 @@ bytes.
+@@ -2776,7 +2783,7 @@ bytes.
  The sole function of @file{boot.img} is to read the first sector of the core
  image from a local disk and jump to it.  Because of the size restriction,
  @file{boot.img} cannot understand any file system structure, so
@@ -508,7 +505,7 @@ index a7155c22f..2b7b7faf8 100644
  core image into @file{boot.img} when installing GRUB.
  
  @item diskboot.img
-@@ -2766,7 +2766,7 @@ images.
+@@ -2806,7 +2813,7 @@ images.
  
  @item core.img
  This is the core image of GRUB.  It is built dynamically from the kernel
@@ -517,7 +514,7 @@ index a7155c22f..2b7b7faf8 100644
  program.  Usually, it contains enough modules to access @file{/boot/grub},
  and loads everything else (including menu handling, the ability to load
  target operating systems, and so on) from the file system at run-time.  The
-@@ -2818,7 +2818,7 @@ GRUB 2 has no single Stage 2 image.  Instead, it loads modules from
+@@ -2858,7 +2865,7 @@ GRUB 2 has no single Stage 2 image.  Instead, it loads modules from
  In GRUB 2, images for booting from CD-ROM drives are now constructed using
  @file{cdboot.img} and @file{core.img}, making sure that the core image
  contains the @samp{iso9660} module.  It is usually best to use the
@@ -526,7 +523,7 @@ index a7155c22f..2b7b7faf8 100644
  
  @item nbgrub
  There is as yet no equivalent for @file{nbgrub} in GRUB 2; it was used by
-@@ -2974,8 +2974,8 @@ There are two ways to specify files, by @dfn{absolute file name} and by
+@@ -3014,8 +3021,8 @@ There are two ways to specify files, by @dfn{absolute file name} and by
  
  An absolute file name resembles a Unix absolute file name, using
  @samp{/} for the directory separator (not @samp{\} as in DOS). One
@@ -537,7 +534,7 @@ index a7155c22f..2b7b7faf8 100644
  disk. If you omit the device name in an absolute file name, GRUB uses
  GRUB's @dfn{root device} implicitly. So if you set the root device to,
  say, @samp{(hd1,1)} by the command @samp{set root=(hd1,1)} (@pxref{set}),
-@@ -2983,8 +2983,8 @@ then @code{/boot/kernel} is the same as @code{(hd1,1)/boot/kernel}.
+@@ -3023,8 +3030,8 @@ then @code{/boot/kernel} is the same as @code{(hd1,1)/boot/kernel}.
  
  On ZFS filesystem the first path component must be
  @var{volume}@samp{@@}[@var{snapshot}].
@@ -548,7 +545,7 @@ index a7155c22f..2b7b7faf8 100644
  @samp{snap-129}.  Trailing @samp{@@} after volume name is mandatory even if
  snapshot name is omitted.
  
-@@ -3387,7 +3387,7 @@ The more recent release of Minix would then be identified as
+@@ -3427,7 +3434,7 @@ The more recent release of Minix would then be identified as
  @samp{other>minix>minix-3.4.0}.
  
  This variable is often set by @samp{GRUB_DEFAULT} (@pxref{Simple
@@ -557,7 +554,7 @@ index a7155c22f..2b7b7faf8 100644
  
  
  @node fallback
-@@ -3477,7 +3477,7 @@ If this variable is set, it names the language code that the
+@@ -3517,7 +3524,7 @@ If this variable is set, it names the language code that the
  example, French would be named as @samp{fr}, and Simplified Chinese as
  @samp{zh_CN}.
  
@@ -566,7 +563,7 @@ index a7155c22f..2b7b7faf8 100644
  reasonable default for this variable based on the system locale.
  
  
-@@ -3485,10 +3485,10 @@ reasonable default for this variable based on the system locale.
+@@ -3525,10 +3532,10 @@ reasonable default for this variable based on the system locale.
  @subsection locale_dir
  
  If this variable is set, it names the directory where translation files may
@@ -579,7 +576,7 @@ index a7155c22f..2b7b7faf8 100644
  default for this variable if internationalization is needed and any
  translation files are available.
  
-@@ -3606,7 +3606,7 @@ input.  The default is not to pause output.
+@@ -3646,7 +3653,7 @@ input.  The default is not to pause output.
  
  The location of the @samp{/boot/grub} directory as an absolute file name
  (@pxref{File name syntax}).  This is normally set by GRUB at startup based
@@ -588,7 +585,7 @@ index a7155c22f..2b7b7faf8 100644
  dynamically loaded from this directory, so it must be set correctly in order
  for many parts of GRUB to work.
  
-@@ -3697,17 +3697,17 @@ GRUB provides an ``environment block'' which can be used to save a small
+@@ -3737,17 +3744,17 @@ GRUB provides an ``environment block'' which can be used to save a small
  amount of state.
  
  The environment block is a preallocated 1024-byte file, which normally lives
@@ -609,7 +606,7 @@ index a7155c22f..2b7b7faf8 100644
  @samp{GRUB_SAVEDEFAULT} (@pxref{Simple configuration}).
  
  
-@@ -4396,7 +4396,7 @@ Translate @var{string} into the current language.
+@@ -4476,7 +4483,7 @@ Translate @var{string} into the current language.
  
  The current language code is stored in the @samp{lang} variable in GRUB's
  environment (@pxref{lang}).  Translation files in MO format are read from
@@ -618,7 +615,7 @@ index a7155c22f..2b7b7faf8 100644
  @end deffn
  
  
-@@ -4791,7 +4791,7 @@ Define a user named @var{user} with password @var{clear-password}.
+@@ -4871,7 +4878,7 @@ Define a user named @var{user} with password @var{clear-password}.
  
  @deffn Command password_pbkdf2 user hashed-password
  Define a user named @var{user} with password hash @var{hashed-password}.
@@ -627,7 +624,7 @@ index a7155c22f..2b7b7faf8 100644
  to generate password hashes.  @xref{Security}.
  @end deffn
  
-@@ -5614,8 +5614,8 @@ The @samp{password} (@pxref{password}) and @samp{password_pbkdf2}
+@@ -5814,8 +5821,8 @@ The @samp{password} (@pxref{password}) and @samp{password_pbkdf2}
  which has an associated password.  @samp{password} sets the password in
  plain text, requiring @file{grub.cfg} to be secure; @samp{password_pbkdf2}
  sets the password hashed using the Password-Based Key Derivation Function
@@ -638,7 +635,7 @@ index a7155c22f..2b7b7faf8 100644
  
  In order to enable authentication support, the @samp{superusers} environment
  variable must be set to a list of usernames, separated by any of spaces,
-@@ -5659,7 +5659,7 @@ menuentry "May be run by user1 or a superuser" --users user1 @{
+@@ -5860,7 +5867,7 @@ menuentry "May be run by user1 or a superuser" --users user1 @{
  @end group
  @end example
  
@@ -647,28 +644,26 @@ index a7155c22f..2b7b7faf8 100644
  generating configuration files with authentication.  You can use
  @file{/etc/grub.d/40_custom} to add simple superuser authentication, by
  adding @kbd{set superusers=} and @kbd{password} or @kbd{password_pbkdf2}
-@@ -5684,15 +5684,15 @@ verified with a public key currently trusted by GRUB
- validation fails, then file @file{foo} cannot be opened.  This failure
- may halt or otherwise impact the boot process.
+@@ -5887,7 +5894,17 @@ may halt or otherwise impact the boot process.
  
--@comment Unfortunately --pubkey is not yet supported by grub-install,
--@comment but we should not bring up internal detail grub-mkimage here
+ An initial trusted public key can be embedded within the GRUB @file{core.img}
+ using the @code{--pubkey} option to @command{grub-install}
+-(@pxref{Invoking grub-install}).
++(@pxref{Invoking grub2-install}).
++
 +@comment Unfortunately --pubkey is not yet supported by grub2-install,
 +@comment but we should not bring up internal detail grub2-mkimage here
- @comment in the user guide (as opposed to developer's manual).
- 
- @comment An initial trusted public key can be embedded within the GRUB
- @comment @file{core.img} using the @code{--pubkey} option to
--@comment @command{grub-mkimage} (@pxref{Invoking grub-install}).  Presently it
--@comment is necessary to write a custom wrapper around @command{grub-mkimage}
--@comment using the @code{--grub-mkimage} flag to @command{grub-install}.
++@comment in the user guide (as opposed to developer's manual).
++
++@comment An initial trusted public key can be embedded within the GRUB
++@comment @file{core.img} using the @code{--pubkey} option to
 +@comment @command{grub2-mkimage} (@pxref{Invoking grub2-install}).  Presently it
 +@comment is necessary to write a custom wrapper around @command{grub2-mkimage}
 +@comment using the @code{--grub-mkimage} flag to @command{grub2-install}.
  
  GRUB uses GPG-style detached signatures (meaning that a file
  @file{foo.sig} will be produced when file @file{foo} is signed), and
-@@ -5712,8 +5712,8 @@ gpg --detach-sign /path/to/file
+@@ -5907,8 +5924,8 @@ gpg --detach-sign /path/to/file
  For successful validation of all of GRUB's subcomponents and the
  loaded OS kernel, they must all be signed.  One way to accomplish this
  is the following (after having already produced the desired
@@ -679,7 +674,7 @@ index a7155c22f..2b7b7faf8 100644
  
  @example
  @group
-@@ -5735,7 +5735,7 @@ See also: @ref{check_signatures}, @ref{verify_detached}, @ref{trust},
+@@ -5930,7 +5947,7 @@ See also: @ref{check_signatures}, @ref{verify_detached}, @ref{trust},
  Note that internally signature enforcement is controlled by setting
  the environment variable @code{check_signatures} equal to
  @code{enforce}.  Passing one or more @code{--pubkey} options to
@@ -688,7 +683,7 @@ index a7155c22f..2b7b7faf8 100644
  equal to @code{enforce} in @file{core.img} prior to processing any
  configuration files.
  
-@@ -6092,10 +6092,10 @@ Required files are:
+@@ -6388,10 +6405,10 @@ Required files are:
  
  GRUB's normal start-up procedure involves setting the @samp{prefix}
  environment variable to a value set in the core image by
@@ -701,7 +696,7 @@ index a7155c22f..2b7b7faf8 100644
  things GRUB is supposed to do.
  
  If, instead, you only get a rescue shell, this usually means that GRUB
-@@ -6121,8 +6121,8 @@ normal
+@@ -6417,8 +6434,8 @@ normal
  
  However, any problem that leaves you in the rescue shell probably means that
  GRUB was not correctly installed.  It may be more useful to try to reinstall
@@ -712,7 +707,7 @@ index a7155c22f..2b7b7faf8 100644
  
  @itemize @bullet{}
  @item
-@@ -6134,7 +6134,7 @@ is usually better to use UUIDs or file system labels and avoid depending on
+@@ -6430,7 +6447,7 @@ is usually better to use UUIDs or file system labels and avoid depending on
  drive ordering entirely.
  
  @item
@@ -721,8 +716,8 @@ index a7155c22f..2b7b7faf8 100644
  to a partition but GRUB has already been installed in the master boot
  record, then the GRUB installation in the partition will be ignored.
  
-@@ -6154,21 +6154,21 @@ support has not yet been added to GRUB.
- @end itemize
+@@ -6461,21 +6478,21 @@ entry which claims partition start at block 0. This change will not hamper
+ bootability on other machines.
  
  
 -@node Invoking grub-install
@@ -749,7 +744,7 @@ index a7155c22f..2b7b7faf8 100644
  
  @table @option
  @item --help
-@@ -6184,13 +6184,13 @@ separate partition or a removable disk.
+@@ -6491,13 +6508,13 @@ separate partition or a removable disk.
  If this option is not specified then it defaults to @file{/boot}, so
  
  @example
@@ -765,7 +760,7 @@ index a7155c22f..2b7b7faf8 100644
  @end example
  
  Here is an example in which you have a separate @dfn{boot} partition which is 
-@@ -6198,16 +6198,16 @@ mounted on
+@@ -6505,16 +6522,16 @@ mounted on
  @file{/mnt/boot}:
  
  @example
@@ -785,7 +780,7 @@ index a7155c22f..2b7b7faf8 100644
  extra space in the bootloader embedding area for Reed-Solomon
  error-correcting codes. This enables GRUB to still boot successfully
  if some blocks are corrupted.  The exact amount of protection offered
-@@ -6220,17 +6220,17 @@ installation}) where GRUB does not reside in any unpartitioned space
+@@ -6527,17 +6544,17 @@ installation}) where GRUB does not reside in any unpartitioned space
  outside of the MBR.  Disable the Reed-Solomon codes with this option.
  @end table
  
@@ -808,7 +803,7 @@ index a7155c22f..2b7b7faf8 100644
  
  @table @option
  @item --help
-@@ -6246,17 +6246,17 @@ it to standard output.
+@@ -6553,17 +6570,17 @@ it to standard output.
  @end table
  
  
@@ -830,7 +825,7 @@ index a7155c22f..2b7b7faf8 100644
  
  @table @option
  @item -c @var{number}
-@@ -6274,23 +6274,23 @@ Length of the salt.  Defaults to 64.
+@@ -6581,23 +6598,23 @@ Length of the salt.  Defaults to 64.
  @end table
  
  
@@ -860,7 +855,7 @@ index a7155c22f..2b7b7faf8 100644
  
  @table @option
  @item --help
-@@ -6301,17 +6301,17 @@ Print the version number of GRUB and exit.
+@@ -6608,17 +6625,17 @@ Print the version number of GRUB and exit.
  @end table
  
  
@@ -882,7 +877,7 @@ index a7155c22f..2b7b7faf8 100644
  passed on directly to @command{xorriso} in @command{mkisofs} emulation mode.
  Options passed to @command{xorriso} will normally be interpreted as
  @command{mkisofs} options; if the option @samp{--} is used, then anything
-@@ -6326,7 +6326,7 @@ mkdir -p disk/boot/grub
+@@ -6633,7 +6650,7 @@ mkdir -p disk/boot/grub
  grub-mkrescue -o grub.iso disk
  @end example
  
@@ -891,7 +886,7 @@ index a7155c22f..2b7b7faf8 100644
  
  @table @option
  @item --help
-@@ -6354,15 +6354,15 @@ Use @var{file} as the @command{xorriso} program, rather than the built-in
+@@ -6661,15 +6678,15 @@ Use @var{file} as the @command{xorriso} program, rather than the built-in
  default.
  
  @item --grub-mkimage=@var{file}
@@ -911,7 +906,7 @@ index a7155c22f..2b7b7faf8 100644
  system or file system image that GRUB understands, using GRUB's file system
  drivers via FUSE.  (It is only available if FUSE development files were
  present when GRUB was built.)  This has a number of uses:
-@@ -6394,13 +6394,13 @@ even if nobody has yet written a FUSE module specifically for that file
+@@ -6701,13 +6718,13 @@ even if nobody has yet written a FUSE module specifically for that file
  system type.
  @end itemize
  
@@ -927,7 +922,7 @@ index a7155c22f..2b7b7faf8 100644
  non-option arguments (if it is given more than one image, it will treat them
  as a RAID set), and also accepts the following options:
  
-@@ -6422,13 +6422,13 @@ Show debugging output for conditions matching @var{string}.
+@@ -6729,13 +6746,13 @@ Show debugging output for conditions matching @var{string}.
  @item -K prompt|@var{file}
  @itemx --zfs-key=prompt|@var{file}
  Load a ZFS encryption key.  If you use @samp{prompt} as the argument,
@@ -943,7 +938,7 @@ index a7155c22f..2b7b7faf8 100644
  root of the supplied file system.
  
  If @var{device} is just a number, then it will be treated as a partition
-@@ -6446,10 +6446,10 @@ Print verbose messages.
+@@ -6753,10 +6770,10 @@ Print verbose messages.
  @end table
  
  
@@ -957,7 +952,7 @@ index a7155c22f..2b7b7faf8 100644
  or device.
  
  @example
-@@ -6457,7 +6457,7 @@ grub-probe --target=fs /boot/grub
+@@ -6764,7 +6781,7 @@ grub-probe --target=fs /boot/grub
  grub-probe --target=drive --device /dev/sda1
  @end example
  
@@ -966,7 +961,7 @@ index a7155c22f..2b7b7faf8 100644
  argument, and also accepts the following options:
  
  @table @option
-@@ -6470,16 +6470,16 @@ Print the version number of GRUB and exit.
+@@ -6777,16 +6794,16 @@ Print the version number of GRUB and exit.
  @item -d
  @itemx --device
  If this option is given, then the non-option argument is a system device
@@ -986,7 +981,7 @@ index a7155c22f..2b7b7faf8 100644
  
  @item -t @var{target}
  @itemx --target=@var{target}
-@@ -6532,19 +6532,19 @@ Print verbose messages.
+@@ -6839,19 +6856,19 @@ Print verbose messages.
  @end table
  
  

SOURCES/0056-macos-just-build-chainloader-entries-don-t-try-any-x.patch

@@ -20,7 +20,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 18 insertions(+), 60 deletions(-)
 
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 9b8f5968e..13a3a6bc7 100644
+index 1b91c102f35..4b27bd20153 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -42,68 +42,25 @@ if [ -z "${OSPROBED}" ] ; then
@@ -104,7 +104,7 @@ index 9b8f5968e..13a3a6bc7 100644
  }
  EOF
  }
-@@ -284,11 +241,12 @@ EOF
+@@ -292,11 +249,12 @@ EOF
        echo "$title_correction_code"
      ;;
      macosx)

SOURCES/0057-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeff Mahoney <jeffm@suse.com>
-Date: Wed, 18 Dec 2013 09:57:04 +0000
+Date: Tue, 9 Jul 2019 13:39:45 +0200
 Subject: [PATCH] grub2/btrfs: Add ability to boot from subvolumes
 
 This patch adds the ability to specify a different root on a btrfs
@@ -24,20 +24,20 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
  2 files changed, 533 insertions(+), 20 deletions(-)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index be195448d..51ed63d42 100644
+index 63203034dfc..f1fff7385b5 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
-@@ -29,6 +29,9 @@
- #include <minilzo.h>
+@@ -38,6 +38,9 @@
+ #include <zstd.h>
  #include <grub/i18n.h>
  #include <grub/btrfs.h>
 +#include <grub/command.h>
 +#include <grub/env.h>
 +#include <grub/extcmd.h>
- 
- GRUB_MOD_LICENSE ("GPLv3+");
- 
-@@ -64,9 +67,11 @@ struct grub_btrfs_superblock
+ #include <grub/crypto.h>
+ #include <grub/diskfilter.h>
+ #include <grub/safemath.h>
+@@ -79,9 +82,11 @@ struct grub_btrfs_superblock
    grub_uint64_t generation;
    grub_uint64_t root_tree;
    grub_uint64_t chunk_tree;
@@ -51,7 +51,7 @@ index be195448d..51ed63d42 100644
    struct grub_btrfs_device this_device;
    char label[0x100];
    grub_uint8_t dummy4[0x100];
-@@ -105,6 +110,7 @@ struct grub_btrfs_data
+@@ -121,6 +126,7 @@ struct grub_btrfs_data
    grub_uint64_t exttree;
    grub_size_t extsize;
    struct grub_btrfs_extent_data *extent;
@@ -59,7 +59,7 @@ index be195448d..51ed63d42 100644
  };
  
  struct grub_btrfs_chunk_item
-@@ -171,6 +177,14 @@ struct grub_btrfs_leaf_descriptor
+@@ -191,6 +197,14 @@ struct grub_btrfs_leaf_descriptor
    } *data;
  };
  
@@ -74,7 +74,7 @@ index be195448d..51ed63d42 100644
  struct grub_btrfs_time
  {
    grub_int64_t sec;
-@@ -215,6 +229,14 @@ struct grub_btrfs_extent_data
+@@ -236,6 +250,14 @@ struct grub_btrfs_extent_data
  
  #define GRUB_BTRFS_OBJECT_ID_CHUNK 0x100
  
@@ -89,7 +89,7 @@ index be195448d..51ed63d42 100644
  static grub_disk_addr_t superblock_sectors[] = { 64 * 2, 64 * 1024 * 2,
    256 * 1048576 * 2, 1048576ULL * 1048576ULL * 2
  };
-@@ -837,6 +859,62 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
+@@ -1173,6 +1195,62 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
    return GRUB_ERR_NONE;
  }
  
@@ -152,7 +152,7 @@ index be195448d..51ed63d42 100644
  static struct grub_btrfs_data *
  grub_btrfs_mount (grub_device_t dev)
  {
-@@ -872,6 +950,13 @@ grub_btrfs_mount (grub_device_t dev)
+@@ -1208,6 +1286,13 @@ grub_btrfs_mount (grub_device_t dev)
    data->devices_attached[0].dev = dev;
    data->devices_attached[0].id = data->sblock.this_device.device_id;
  
@@ -166,7 +166,7 @@ index be195448d..51ed63d42 100644
    return data;
  }
  
-@@ -1232,6 +1317,91 @@ get_root (struct grub_btrfs_data *data, struct grub_btrfs_key *key,
+@@ -1673,6 +1758,91 @@ get_root (struct grub_btrfs_data *data, struct grub_btrfs_key *key,
    return GRUB_ERR_NONE;
  }
  
@@ -258,7 +258,7 @@ index be195448d..51ed63d42 100644
  static grub_err_t
  find_path (struct grub_btrfs_data *data,
  	   const char *path, struct grub_btrfs_key *key,
-@@ -1250,14 +1420,26 @@ find_path (struct grub_btrfs_data *data,
+@@ -1691,14 +1861,26 @@ find_path (struct grub_btrfs_data *data,
    char *origpath = NULL;
    unsigned symlinks_max = 32;
  
@@ -289,7 +289,7 @@ index be195448d..51ed63d42 100644
    while (1)
      {
        while (path[0] == '/')
-@@ -1430,9 +1612,21 @@ find_path (struct grub_btrfs_data *data,
+@@ -1871,9 +2053,21 @@ find_path (struct grub_btrfs_data *data,
  	  path = path_alloc = tmp;
  	  if (path[0] == '/')
  	    {
@@ -314,7 +314,7 @@ index be195448d..51ed63d42 100644
  	    }
  	  continue;
  	}
-@@ -1673,18 +1867,10 @@ grub_btrfs_read (grub_file_t file, char *buf, grub_size_t len)
+@@ -2114,18 +2308,10 @@ grub_btrfs_read (grub_file_t file, char *buf, grub_size_t len)
  				 data->tree, file->offset, buf, len);
  }
  
@@ -336,7 +336,7 @@ index be195448d..51ed63d42 100644
  			  grub_be_to_cpu16 (data->sblock.uuid[0]),
  			  grub_be_to_cpu16 (data->sblock.uuid[1]),
  			  grub_be_to_cpu16 (data->sblock.uuid[2]),
-@@ -1693,6 +1879,20 @@ grub_btrfs_uuid (grub_device_t device, char **uuid)
+@@ -2134,6 +2320,20 @@ grub_btrfs_uuid (grub_device_t device, char **uuid)
  			  grub_be_to_cpu16 (data->sblock.uuid[5]),
  			  grub_be_to_cpu16 (data->sblock.uuid[6]),
  			  grub_be_to_cpu16 (data->sblock.uuid[7]));
@@ -357,7 +357,7 @@ index be195448d..51ed63d42 100644
  
    grub_btrfs_unmount (data);
  
-@@ -1749,6 +1949,242 @@ grub_btrfs_embed (grub_device_t device __attribute__ ((unused)),
+@@ -2190,6 +2390,242 @@ grub_btrfs_embed (grub_device_t device __attribute__ ((unused)),
  }
  #endif
  
@@ -599,8 +599,8 @@ index be195448d..51ed63d42 100644
 +
  static struct grub_fs grub_btrfs_fs = {
    .name = "btrfs",
-   .dir = grub_btrfs_dir,
-@@ -1764,12 +2200,88 @@ static struct grub_fs grub_btrfs_fs = {
+   .fs_dir = grub_btrfs_dir,
+@@ -2205,12 +2641,88 @@ static struct grub_fs grub_btrfs_fs = {
  #endif
  };
  
@@ -690,7 +690,7 @@ index be195448d..51ed63d42 100644
 +
 +// vim: si et sw=2:
 diff --git a/include/grub/btrfs.h b/include/grub/btrfs.h
-index 9d93fb6c1..234ad9767 100644
+index 9d93fb6c182..234ad976771 100644
 --- a/include/grub/btrfs.h
 +++ b/include/grub/btrfs.h
 @@ -29,6 +29,7 @@ enum

SOURCES/0058-export-btrfs_subvol-and-btrfs_subvolid.patch

@@ -12,10 +12,10 @@ Signed-off-by: Michael Chang <mchang@suse.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 51ed63d42..88d727d16 100644
+index f1fff7385b5..ad1b56b716d 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
-@@ -2273,6 +2273,8 @@ GRUB_MOD_INIT (btrfs)
+@@ -2714,6 +2714,8 @@ GRUB_MOD_INIT (btrfs)
                                 subvol_set_env);
    grub_register_variable_hook ("btrfs_subvolid", subvolid_get_env,
                                 subvolid_set_env);

SOURCES/0059-Update-info-with-grub.cfg-netboot-selection-order-11.patch

@@ -1,66 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Robert Marshall <rmarshall@redhat.com>
-Date: Mon, 16 Mar 2015 16:34:51 -0400
-Subject: [PATCH] Update info with grub.cfg netboot selection order (#1148650)
-
-Added documentation to the grub info page that specifies the order
-netboot clients will use to select a grub configuration file.
-
-Resolves rhbz#1148650
----
- docs/grub.texi | 42 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 42 insertions(+)
-
-diff --git a/docs/grub.texi b/docs/grub.texi
-index 2fd32608c..a7155c22f 100644
---- a/docs/grub.texi
-+++ b/docs/grub.texi
-@@ -2493,6 +2493,48 @@ grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i38
- Then follow instructions printed out by grub-mknetdir on configuring your DHCP
- server.
- 
-+The grub.cfg file is placed in the same directory as the path output by
-+grub-mknetdir hereafter referred to as FWPATH. GRUB will search for its 
-+configuration files in order using the following rules where the appended
-+value corresponds to a value on the client machine.
-+
-+@example
-+@group
-+@samp{(FWPATH)}/grub.cfg-@samp{(UUID OF NIC)}
-+@samp{(FWPATH)}/grub.cfg-@samp{(MAC ADDRESS OF NIC)}
-+@samp{(FWPATH)}/grub.cfg-@samp{(IPv4 OR IPv6 ADDRESS)}
-+@samp{(FWPATH)}/grub.cfg
-+@end group
-+@end example
-+
-+The client will only attempt to look up an IPv6 address config once, however,
-+it will try the IPv4 multiple times. The concrete example below shows what
-+would happen under the IPv4 case.
-+
-+@example
-+@group
-+UUID: 7726a678-7fc0-4853-a4f6-c85ac36a120a
-+MAC:  52:54:00:ec:33:81
-+IPV4: 10.0.0.130 (0A000082)
-+@end group
-+@end example
-+
-+@example
-+@group
-+@samp{(FWPATH)}/grub.cfg-7726a678-7fc0-4853-a4f6-c85ac36a120a
-+@samp{(FWPATH)}/grub.cfg-52-54-00-ec-33-81
-+@samp{(FWPATH)}/grub.cfg-0A000082
-+@samp{(FWPATH)}/grub.cfg-0A00008
-+@samp{(FWPATH)}/grub.cfg-0A0000
-+@samp{(FWPATH)}/grub.cfg-0A000
-+@samp{(FWPATH)}/grub.cfg-0A00
-+@samp{(FWPATH)}/grub.cfg-0A0
-+@samp{(FWPATH)}/grub.cfg-0A
-+@samp{(FWPATH)}/grub.cfg-0
-+@samp{(FWPATH)}/grub.cfg
-+@end group
-+@end example
-+
- After GRUB has started, files on the TFTP server will be accessible via the
- @samp{(tftp)} device.
- 

SOURCES/0059-grub2-btrfs-03-follow_default.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] grub2-btrfs-03-follow_default
  1 file changed, 76 insertions(+), 31 deletions(-)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 88d727d16..a47d29756 100644
+index ad1b56b716d..113c1f746c9 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
-@@ -920,6 +920,7 @@ grub_btrfs_mount (grub_device_t dev)
+@@ -1256,6 +1256,7 @@ grub_btrfs_mount (grub_device_t dev)
  {
    struct grub_btrfs_data *data;
    grub_err_t err;
@@ -19,7 +19,7 @@ index 88d727d16..a47d29756 100644
  
    if (!dev->disk)
      {
-@@ -950,11 +951,14 @@ grub_btrfs_mount (grub_device_t dev)
+@@ -1286,11 +1287,14 @@ grub_btrfs_mount (grub_device_t dev)
    data->devices_attached[0].dev = dev;
    data->devices_attached[0].id = data->sblock.this_device.device_id;
  
@@ -38,7 +38,7 @@ index 88d727d16..a47d29756 100644
      }
  
    return data;
-@@ -1414,24 +1418,39 @@ find_path (struct grub_btrfs_data *data,
+@@ -1855,24 +1859,39 @@ find_path (struct grub_btrfs_data *data,
    grub_size_t allocated = 0;
    struct grub_btrfs_dir_item *direl = NULL;
    struct grub_btrfs_key key_out;
@@ -85,7 +85,7 @@ index 88d727d16..a47d29756 100644
      }
    else
      {
-@@ -1442,15 +1461,23 @@ find_path (struct grub_btrfs_data *data,
+@@ -1883,15 +1902,23 @@ find_path (struct grub_btrfs_data *data,
  
    while (1)
      {
@@ -118,7 +118,7 @@ index 88d727d16..a47d29756 100644
  
        if (*type != GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY)
  	{
-@@ -1461,7 +1488,9 @@ find_path (struct grub_btrfs_data *data,
+@@ -1902,7 +1929,9 @@ find_path (struct grub_btrfs_data *data,
  
        if (ctokenlen == 1 && ctoken[0] == '.')
  	{
@@ -129,7 +129,7 @@ index 88d727d16..a47d29756 100644
  	  continue;
  	}
        if (ctokenlen == 2 && ctoken[0] == '.' && ctoken[1] == '.')
-@@ -1492,8 +1521,9 @@ find_path (struct grub_btrfs_data *data,
+@@ -1933,8 +1962,9 @@ find_path (struct grub_btrfs_data *data,
  	  *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
  	  key->object_id = key_out.offset;
  
@@ -141,7 +141,7 @@ index 88d727d16..a47d29756 100644
  	  continue;
  	}
  
-@@ -1562,7 +1592,9 @@ find_path (struct grub_btrfs_data *data,
+@@ -2003,7 +2033,9 @@ find_path (struct grub_btrfs_data *data,
  	  return err;
  	}
  
@@ -152,7 +152,7 @@ index 88d727d16..a47d29756 100644
        if (cdirel->type == GRUB_BTRFS_DIR_ITEM_TYPE_SYMLINK)
  	{
  	  struct grub_btrfs_inode inode;
-@@ -1612,14 +1644,26 @@ find_path (struct grub_btrfs_data *data,
+@@ -2053,14 +2085,26 @@ find_path (struct grub_btrfs_data *data,
  	  path = path_alloc = tmp;
  	  if (path[0] == '/')
  	    {
@@ -186,7 +186,7 @@ index 88d727d16..a47d29756 100644
  		}
  	      else
  		{
-@@ -2275,6 +2319,7 @@ GRUB_MOD_INIT (btrfs)
+@@ -2716,6 +2760,7 @@ GRUB_MOD_INIT (btrfs)
                                 subvolid_set_env);
    grub_env_export ("btrfs_subvol");
    grub_env_export ("btrfs_subvolid");

SOURCES/0060-grub2-btrfs-04-grub2-install.patch

@@ -13,7 +13,7 @@ Subject: [PATCH] grub2-btrfs-04-grub2-install
  6 files changed, 54 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 6d9f4e5fa..5d50dd6f8 100644
+index 001b818fe58..caf9b1ccd3f 100644
 --- a/grub-core/osdep/linux/getroot.c
 +++ b/grub-core/osdep/linux/getroot.c
 @@ -376,6 +376,7 @@ get_btrfs_fs_prefix (const char *mount_path)
@@ -38,7 +38,7 @@ index 6d9f4e5fa..5d50dd6f8 100644
        else if (!retry && grub_strcmp (entries[i].fstype, "autofs") == 0)
  	{
 diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
-index 65effa9f3..b637c58ef 100644
+index 7d6325138ce..46a881530c0 100644
 --- a/grub-core/osdep/unix/config.c
 +++ b/grub-core/osdep/unix/config.c
 @@ -82,6 +82,19 @@ grub_util_load_config (struct grub_util_config *cfg)
@@ -73,7 +73,7 @@ index 65effa9f3..b637c58ef 100644
    argv[2] = script;
    argv[3] = '\0';
 diff --git a/util/config.c b/util/config.c
-index ebcdd8f5e..f044a880a 100644
+index ebcdd8f5e22..f044a880a76 100644
 --- a/util/config.c
 +++ b/util/config.c
 @@ -42,6 +42,16 @@ grub_util_parse_config (FILE *f, struct grub_util_config *cfg, int simple)
@@ -94,10 +94,10 @@ index ebcdd8f5e..f044a880a 100644
  			sizeof ("GRUB_DISTRIBUTOR=") - 1) == 0)
  	{
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 78d0138cb..4375c1619 100644
+index 0fbe7f78c6d..0f66f36d23a 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
-@@ -816,6 +816,8 @@ fill_core_services (const char *core_services)
+@@ -827,6 +827,8 @@ fill_core_services (const char *core_services)
    free (sysv_plist);
  }
  
@@ -106,7 +106,7 @@ index 78d0138cb..4375c1619 100644
  int
  main (int argc, char *argv[])
  {
-@@ -849,6 +851,9 @@ main (int argc, char *argv[])
+@@ -860,6 +862,9 @@ main (int argc, char *argv[])
  
    grub_util_load_config (&config);
  
@@ -116,7 +116,7 @@ index 78d0138cb..4375c1619 100644
    if (!bootloader_id && config.grub_distributor)
      {
        char *ptr;
-@@ -1321,6 +1326,16 @@ main (int argc, char *argv[])
+@@ -1352,6 +1357,16 @@ main (int argc, char *argv[])
        fprintf (load_cfg_f, "set debug='%s'\n",
  	      debug_image);
      }
@@ -134,7 +134,7 @@ index 78d0138cb..4375c1619 100644
    char *install_drive = NULL;
  
 diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c
-index 47a241a39..5db7a9a7d 100644
+index 47a241a391b..5db7a9a7d97 100644
 --- a/util/grub-mkrelpath.c
 +++ b/util/grub-mkrelpath.c
 @@ -40,9 +40,12 @@ struct arguments
@@ -161,7 +161,7 @@ index 47a241a39..5db7a9a7d 100644
        if (state->arg_num == 0)
  	arguments->pathname = xstrdup (arg);
 diff --git a/include/grub/emu/config.h b/include/grub/emu/config.h
-index 875d5896c..c9a7e5f4a 100644
+index 875d5896ce1..c9a7e5f4ade 100644
 --- a/include/grub/emu/config.h
 +++ b/include/grub/emu/config.h
 @@ -37,6 +37,7 @@ struct grub_util_config

SOURCES/0061-Handle-rssd-storage-devices.patch

@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 30 Jun 2015 15:50:41 -0400
-Subject: [PATCH] Handle rssd storage devices.
-
-Resolves: rhbz#1087962
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/osdep/linux/getroot.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 90d92d3ad..6d9f4e5fa 100644
---- a/grub-core/osdep/linux/getroot.c
-+++ b/grub-core/osdep/linux/getroot.c
-@@ -921,6 +921,19 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,
- 	  return path;
- 	}
- 
-+      /* If this is an rssd device. */
-+      if ((strncmp ("rssd", p, 4) == 0) && p[4] >= 'a' && p[4] <= 'z')
-+	{
-+	  char *pp = p + 4;
-+	  while (*pp >= 'a' && *pp <= 'z')
-+	    pp++;
-+	  if (*pp)
-+	    *is_part = 1;
-+	  /* /dev/rssd[a-z]+[0-9]* */
-+	  *pp = '\0';
-+	  return path;
-+	}
-+
-       /* If this is a loop device */
-       if ((strncmp ("loop", p, 4) == 0) && p[4] >= '0' && p[4] <= '9')
- 	{

SOURCES/0061-grub2-btrfs-05-grub2-mkconfig.patch

@@ -3,19 +3,20 @@ From: Michael Chang <mchang@suse.com>
 Date: Thu, 21 Aug 2014 03:39:11 +0000
 Subject: [PATCH] grub2-btrfs-05-grub2-mkconfig
 
+Signed-off-by: Michael Chang <mchang@suse.com>
 ---
  util/grub-mkconfig.in       |  3 ++-
  util/grub-mkconfig_lib.in   |  4 ++++
- util/grub.d/00_header.in    | 24 +++++++++++++++++++++++-
+ util/grub.d/00_header.in    | 25 ++++++++++++++++++++++++-
  util/grub.d/10_linux.in     |  4 ++++
  util/grub.d/20_linux_xen.in |  4 ++++
- 5 files changed, 37 insertions(+), 2 deletions(-)
+ 5 files changed, 38 insertions(+), 2 deletions(-)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 8218f3d47..4248b9341 100644
+index 005f093809b..535c0f02499 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -258,7 +258,8 @@ export GRUB_DEFAULT \
+@@ -252,7 +252,8 @@ export GRUB_DEFAULT \
    GRUB_BADRAM \
    GRUB_OS_PROBER_SKIP_LIST \
    GRUB_DISABLE_SUBMENU \
@@ -26,7 +27,7 @@ index 8218f3d47..4248b9341 100644
  if test "x${grub_cfg}" != "x"; then
    rm -f "${grub_cfg}.new"
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 113a41f94..b3aae534d 100644
+index 42c2ea9ba50..fafeac95061 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -52,7 +52,11 @@ grub_warn ()
@@ -42,7 +43,7 @@ index 113a41f94..b3aae534d 100644
  
  is_path_readable_by_grub ()
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 858b526c9..e2a533001 100644
+index 858b526c925..de727e6ee6b 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
 @@ -27,6 +27,14 @@ export TEXTDOMAINDIR="@localedir@"
@@ -71,12 +72,13 @@ index 858b526c9..e2a533001 100644
    load_env
  fi
  EOF
-@@ -356,3 +366,15 @@ fi
+@@ -356,3 +366,16 @@ fi
  if [ "x${GRUB_BADRAM}" != "x" ] ; then
    echo "badram ${GRUB_BADRAM}"
  fi
 +
 +if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] &&
++   [ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ] &&
 +   [ "x${GRUB_FS}" = "xbtrfs" ] ; then
 +    # Note: No $snapshot_num on *read-only* rollback!  (bsc#901487)
 +    cat <<EOF
@@ -88,7 +90,7 @@ index 858b526c9..e2a533001 100644
 +EOF
 +fi
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 4e49ccdf7..d9a05937e 100644
+index 0f3c19e30cc..cbfaca34cc7 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -66,10 +66,14 @@ fi
@@ -107,7 +109,7 @@ index 4e49ccdf7..d9a05937e 100644
      xzfs)
  	rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index 972a4b5a0..bcdc3ceac 100644
+index ada20775a14..e9e73b815fb 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
 @@ -73,10 +73,14 @@ fi

SOURCES/0062-grub2-btrfs-06-subvol-mount.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
-Date: Fri, 22 May 2015 11:45:25 +0000
+Date: Tue, 9 Jul 2019 13:56:16 +0200
 Subject: [PATCH] grub2-btrfs-06-subvol-mount
 
 ---
@@ -11,18 +11,18 @@ Subject: [PATCH] grub2-btrfs-06-subvol-mount
  4 files changed, 392 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index a47d29756..2e36ac47e 100644
+index 113c1f746c9..d323746ecfa 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
-@@ -32,6 +32,7 @@
+@@ -41,6 +41,7 @@
  #include <grub/command.h>
  #include <grub/env.h>
  #include <grub/extcmd.h>
 +#include <grub/list.h>
- 
- GRUB_MOD_LICENSE ("GPLv3+");
- 
-@@ -245,6 +246,12 @@ static grub_err_t
+ #include <grub/crypto.h>
+ #include <grub/diskfilter.h>
+ #include <grub/safemath.h>
+@@ -266,6 +267,12 @@ static grub_err_t
  grub_btrfs_read_logical (struct grub_btrfs_data *data,
  			 grub_disk_addr_t addr, void *buf, grub_size_t size,
  			 int recursion_depth);
@@ -35,7 +35,7 @@ index a47d29756..2e36ac47e 100644
  
  static grub_err_t
  read_sblock (grub_disk_t disk, struct grub_btrfs_superblock *sb)
-@@ -887,9 +894,26 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
+@@ -1223,9 +1230,26 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
    grub_err_t err;
    grub_uint64_t tree = 0;
    grub_uint8_t type;
@@ -62,7 +62,7 @@ index a47d29756..2e36ac47e 100644
    if (err)
        return grub_error(GRUB_ERR_FILE_NOT_FOUND, "couldn't locate %s\n", path);
  
-@@ -1758,11 +1782,20 @@ grub_btrfs_dir (grub_device_t device, const char *path,
+@@ -2199,11 +2223,20 @@ grub_btrfs_dir (grub_device_t device, const char *path,
    int r = 0;
    grub_uint64_t tree;
    grub_uint8_t type;
@@ -84,7 +84,7 @@ index a47d29756..2e36ac47e 100644
    if (err)
      {
        grub_btrfs_unmount (data);
-@@ -1864,11 +1897,21 @@ grub_btrfs_open (struct grub_file *file, const char *name)
+@@ -2305,11 +2338,21 @@ grub_btrfs_open (struct grub_file *file, const char *name)
    struct grub_btrfs_inode inode;
    grub_uint8_t type;
    struct grub_btrfs_key key_in;
@@ -107,7 +107,7 @@ index a47d29756..2e36ac47e 100644
    if (err)
      {
        grub_btrfs_unmount (data);
-@@ -2039,6 +2082,150 @@ grub_cmd_btrfs_info (grub_command_t cmd __attribute__ ((unused)), int argc,
+@@ -2480,6 +2523,150 @@ grub_cmd_btrfs_info (grub_command_t cmd __attribute__ ((unused)), int argc,
    return 0;
  }
  
@@ -258,7 +258,7 @@ index a47d29756..2e36ac47e 100644
  static grub_err_t
  get_fs_root(struct grub_btrfs_data *data, grub_uint64_t tree,
              grub_uint64_t objectid, grub_uint64_t offset,
-@@ -2245,6 +2432,7 @@ static struct grub_fs grub_btrfs_fs = {
+@@ -2686,6 +2873,7 @@ static struct grub_fs grub_btrfs_fs = {
  };
  
  static grub_command_t cmd_info;
@@ -266,7 +266,7 @@ index a47d29756..2e36ac47e 100644
  static grub_extcmd_t cmd_list_subvols;
  
  static char *
-@@ -2308,6 +2496,9 @@ GRUB_MOD_INIT (btrfs)
+@@ -2749,6 +2937,9 @@ GRUB_MOD_INIT (btrfs)
    cmd_info = grub_register_command("btrfs-info", grub_cmd_btrfs_info,
  				   "DEVICE",
  				   "Print BtrFS info about DEVICE.");
@@ -277,7 +277,7 @@ index a47d29756..2e36ac47e 100644
  					 grub_cmd_btrfs_list_subvols, 0,
  					 "[-p|-n] [-o var] DEVICE",
 diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 5d50dd6f8..4c5a13022 100644
+index caf9b1ccd3f..28790307e00 100644
 --- a/grub-core/osdep/linux/getroot.c
 +++ b/grub-core/osdep/linux/getroot.c
 @@ -107,6 +107,14 @@ struct btrfs_ioctl_search_key
@@ -460,10 +460,10 @@ index 5d50dd6f8..4c5a13022 100644
  grub_make_system_path_relative_to_its_root_os (const char *path)
  {
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 4375c1619..a0ad99729 100644
+index 0f66f36d23a..84ed6e88ecb 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
-@@ -1535,6 +1535,55 @@ main (int argc, char *argv[])
+@@ -1569,6 +1569,55 @@ main (int argc, char *argv[])
        prefix_drive = xasprintf ("(%s)", grub_drives[0]);
      }
  
@@ -520,7 +520,7 @@ index 4375c1619..a0ad99729 100644
    const char *core_name = NULL;
  
 diff --git a/include/grub/emu/getroot.h b/include/grub/emu/getroot.h
-index 73fa2d34a..9c642ae3f 100644
+index 73fa2d34abb..9c642ae3fe3 100644
 --- a/include/grub/emu/getroot.h
 +++ b/include/grub/emu/getroot.h
 @@ -53,6 +53,11 @@ char **

SOURCES/0063-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch

@@ -10,10 +10,10 @@ Ref: bsc#953538
  1 file changed, 31 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 2e36ac47e..4a31d39ee 100644
+index d323746ecfa..673ded03522 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
-@@ -924,11 +924,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
+@@ -1260,11 +1260,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
    return GRUB_ERR_NONE;
  }
  

SOURCES/0064-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] Grub not working correctly with btrfs snapshots (bsc#1026511)
  1 file changed, 238 insertions(+)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 4a31d39ee..7002ad81b 100644
+index 673ded03522..2b21cbaa67e 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
-@@ -2446,6 +2446,238 @@ out:
+@@ -2887,6 +2887,238 @@ out:
    return 0;
  }
  
@@ -249,8 +249,8 @@ index 4a31d39ee..7002ad81b 100644
 +
  static struct grub_fs grub_btrfs_fs = {
    .name = "btrfs",
-   .dir = grub_btrfs_dir,
-@@ -2464,6 +2696,7 @@ static struct grub_fs grub_btrfs_fs = {
+   .fs_dir = grub_btrfs_dir,
+@@ -2905,6 +3137,7 @@ static struct grub_fs grub_btrfs_fs = {
  static grub_command_t cmd_info;
  static grub_command_t cmd_mount_subvol;
  static grub_extcmd_t cmd_list_subvols;
@@ -258,7 +258,7 @@ index 4a31d39ee..7002ad81b 100644
  
  static char *
  subvolid_set_env (struct grub_env_var *var __attribute__ ((unused)),
-@@ -2534,6 +2767,11 @@ GRUB_MOD_INIT (btrfs)
+@@ -2975,6 +3208,11 @@ GRUB_MOD_INIT (btrfs)
  					 "[-p|-n] [-o var] DEVICE",
  					 "Print list of BtrFS subvolumes on "
  					 "DEVICE.", options);

SOURCES/0064-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch

@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Mon, 3 Aug 2015 11:46:42 -0400
-Subject: [PATCH] Try to make sure configure.ac and grub-rpm-sort play nice.
-
-Apparently the test for whether to use grub-rpm-sort and also the
-renaming of it to grub2-rpm-sort on the runtime side weren't right.
-
-Related: rhbz#1124074
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- configure.ac              | 2 +-
- util/grub-mkconfig_lib.in | 9 ++++++---
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 679f634ce..71d105696 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1796,7 +1796,7 @@ AC_SUBST([LIBDEVMAPPER])
- AC_ARG_ENABLE([rpm-sort],
-               [AS_HELP_STRING([--enable-rpm-sort],
-                               [enable native rpm sorting of kernels in grub (default=guessed)])])
--if test x"$enable_rpm-sort" = xno ; then
-+if test x"$enable_rpm_sort" = xno ; then
-   rpm_sort_excuse="explicitly disabled"
- fi
- 
-diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 7fe359843..113a41f94 100644
---- a/util/grub-mkconfig_lib.in
-+++ b/util/grub-mkconfig_lib.in
-@@ -33,6 +33,9 @@ fi
- if test "x$grub_mkrelpath" = x; then
-   grub_mkrelpath="${bindir}/@grub_mkrelpath@"
- fi
-+if test "x$grub_rpm_sort" = x; then
-+  grub_rpm_sort="${sbindir}/@grub_rpm_sort@"
-+fi
- 
- if which gettext >/dev/null 2>/dev/null; then
-   :
-@@ -214,10 +217,10 @@ version_sort ()
-    esac
- }
- 
--if [ "x$RPMLIB" = x ]; then
-+if [ "x$grub_rpm_sort" != x -a -x "$grub_rpm_sort" ]; then
-+  kernel_sort="$grub_rpm_sort"
-+else
-   kernel_sort=version_sort
--else
--  kernel_sort="${sbindir}/grub-rpm-sort"
- fi
- 
- version_test_numeric ()

SOURCES/0065-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch

@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 32 insertions(+), 4 deletions(-)
 
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 39480b386..09a18e563 100644
+index 585fa6662b6..03f9a9d0118 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
 @@ -24,6 +24,10 @@
@@ -58,7 +58,7 @@ index 39480b386..09a18e563 100644
  grub_efi_loaded_image_t *EXPORT_FUNC(grub_efi_get_loaded_image) (grub_efi_handle_t image_handle);
  void EXPORT_FUNC(grub_efi_print_device_path) (grub_efi_device_path_t *dp);
  char *EXPORT_FUNC(grub_efi_get_filename) (grub_efi_device_path_t *dp);
-@@ -109,10 +140,7 @@ void grub_efi_init (void);
+@@ -115,10 +146,7 @@ void grub_efi_init (void);
  void grub_efi_fini (void);
  void grub_efi_set_prefix (void);
  

SOURCES/0066-Use-grub_efi_.-memory-helpers-where-reasonable.patch

@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 9 insertions(+), 15 deletions(-)
 
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 5cd9b6e08..106eb10a3 100644
+index 3ff305b1d32..ba3d2930197 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -65,7 +65,7 @@ grub_chainloader_unload (void)
@@ -34,7 +34,7 @@ index 5cd9b6e08..106eb10a3 100644
  
    grub_loader_unset ();
  
-@@ -500,10 +500,9 @@ grub_efi_get_media_file_path (grub_efi_device_path_t *dp)
+@@ -523,10 +523,9 @@ grub_efi_get_media_file_path (grub_efi_device_path_t *dp)
  static grub_efi_boolean_t
  handle_image (void *data, grub_efi_uint32_t datasize)
  {
@@ -46,7 +46,7 @@ index 5cd9b6e08..106eb10a3 100644
    char *buffer_aligned = NULL;
    grub_efi_uint32_t i;
    struct grub_pe32_section_table *section;
-@@ -514,8 +513,6 @@ handle_image (void *data, grub_efi_uint32_t datasize)
+@@ -537,8 +536,6 @@ handle_image (void *data, grub_efi_uint32_t datasize)
    int found_entry_point = 0;
    int rc;
  
@@ -55,7 +55,7 @@ index 5cd9b6e08..106eb10a3 100644
    rc = read_header (data, datasize, &context);
    if (rc < 0)
      {
-@@ -555,8 +552,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
+@@ -578,8 +575,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
    grub_dprintf ("chain", "image size is %08"PRIxGRUB_UINT64_T", datasize is %08x\n",
  	       context.image_size, datasize);
  
@@ -66,7 +66,7 @@ index 5cd9b6e08..106eb10a3 100644
  
    if (efi_status != GRUB_EFI_SUCCESS)
      {
-@@ -788,14 +785,14 @@ handle_image (void *data, grub_efi_uint32_t datasize)
+@@ -811,14 +808,14 @@ handle_image (void *data, grub_efi_uint32_t datasize)
  
    grub_dprintf ("chain", "entry_point returned %ld\n", efi_status);
    grub_memcpy (li, &li_bak, sizeof (grub_efi_loaded_image_t));
@@ -83,7 +83,7 @@ index 5cd9b6e08..106eb10a3 100644
  
    return 0;
  }
-@@ -803,10 +800,7 @@ error_exit:
+@@ -826,10 +823,7 @@ error_exit:
  static grub_err_t
  grub_secureboot_chainloader_unload (void)
  {
@@ -95,7 +95,7 @@ index 5cd9b6e08..106eb10a3 100644
    grub_free (file_path);
    grub_free (cmdline);
    cmdline = 0;
-@@ -1073,7 +1067,7 @@ fail:
+@@ -1096,7 +1090,7 @@ fail:
    grub_free (file_path);
  
    if (address)

SOURCES/0066-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch

@@ -1,59 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: RHEL Ninjas <example@example.com>
-Date: Fri, 25 Sep 2015 16:24:23 +0900
-Subject: [PATCH] efinet: add filter for the first exclusive reopen of SNP
-
----
- grub-core/net/drivers/efi/efinet.c | 39 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 39 insertions(+)
-
-diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 5388f952b..d15a799f2 100644
---- a/grub-core/net/drivers/efi/efinet.c
-+++ b/grub-core/net/drivers/efi/efinet.c
-@@ -383,6 +383,45 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
- 				    &pxe_mode->dhcp_ack,
- 				    sizeof (pxe_mode->dhcp_ack),
- 				    1, device, path);
-+    net = grub_efi_open_protocol (card->efi_handle, &net_io_guid,
-+				  GRUB_EFI_OPEN_PROTOCOL_BY_EXCLUSIVE);
-+    if (net) {
-+      if (net->mode->state == GRUB_EFI_NETWORK_STOPPED
-+	  && efi_call_1 (net->start, net) != GRUB_EFI_SUCCESS)
-+	continue;
-+
-+      if (net->mode->state == GRUB_EFI_NETWORK_STOPPED)
-+	continue;
-+
-+      if (net->mode->state == GRUB_EFI_NETWORK_STARTED
-+	  && efi_call_3 (net->initialize, net, 0, 0) != GRUB_EFI_SUCCESS)
-+	continue;
-+
-+      /* Enable hardware receive filters if driver declares support for it.
-+	 We need unicast and broadcast and additionaly all nodes and
-+	 solicited multicast for IPv6. Solicited multicast is per-IPv6
-+	 address and we currently do not have API to do it so simply
-+	 try to enable receive of all multicast packets or evertyhing in
-+	 the worst case (i386 PXE driver always enables promiscuous too).
-+
-+	 This does trust firmware to do what it claims to do.
-+       */
-+      if (net->mode->receive_filter_mask)
-+	{
-+	  grub_uint32_t filters = GRUB_EFI_SIMPLE_NETWORK_RECEIVE_UNICAST   |
-+				  GRUB_EFI_SIMPLE_NETWORK_RECEIVE_BROADCAST |
-+				  GRUB_EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS_MULTICAST;
-+
-+	  filters &= net->mode->receive_filter_mask;
-+	  if (!(filters & GRUB_EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS_MULTICAST))
-+	    filters |= (net->mode->receive_filter_mask &
-+			GRUB_EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS);
-+
-+	  efi_call_6 (net->receive_filters, net, filters, 0, 0, 0, NULL);
-+	}
-+
-+      card->efi_net = net;
-+    }
-     return;
-   }
- }

SOURCES/0067-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch

@@ -8,14 +8,14 @@ This avoids syntax checkers getting confused about if it's llx or lx.
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  grub-core/loader/efi/chainloader.c | 3 ++-
- include/grub/efi/api.h             | 8 ++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
+ include/grub/efi/api.h             | 9 +++++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 106eb10a3..3630b0cbf 100644
+index ba3d2930197..47f5aa14817 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
-@@ -783,7 +783,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
+@@ -806,7 +806,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
    efi_status = efi_call_2 (entry_point, grub_efi_image_handle,
  			   grub_efi_system_table);
  
@@ -26,13 +26,15 @@ index 106eb10a3..3630b0cbf 100644
    efi_status = grub_efi_free_pool (buffer);
  
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 28b6adf76..e5b521bd9 100644
+index 117469450d3..99628801478 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -527,6 +527,14 @@ typedef grub_uint8_t grub_efi_char8_t;
+@@ -546,7 +546,16 @@ typedef grub_uint64_t grub_efi_uint64_t;
+ typedef grub_uint8_t grub_efi_char8_t;
  typedef grub_uint16_t grub_efi_char16_t;
  
- typedef grub_efi_intn_t grub_efi_status_t;
++
+ typedef grub_efi_uintn_t grub_efi_status_t;
 +/* Make grub_efi_status_t reasonably printable. */
 +#if GRUB_CPU_SIZEOF_VOID_P == 8
 +#define PRIxGRUB_EFI_STATUS "lx"

SOURCES/0067-Fix-security-issue-when-reading-username-and-passwor.patch

@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Hector Marco-Gisbert <hecmargi@upv.es>
-Date: Fri, 13 Nov 2015 16:21:09 +0100
-Subject: [PATCH] Fix security issue when reading username and password
-
-  This patch fixes two integer underflows at:
-    * grub-core/lib/crypto.c
-    * grub-core/normal/auth.c
-
-Resolves: CVE-2015-8370
-
-Signed-off-by: Hector Marco-Gisbert <hecmargi@upv.es>
-Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es>
----
- grub-core/lib/crypto.c  | 2 +-
- grub-core/normal/auth.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
-index ca334d5a4..e6c78d16d 100644
---- a/grub-core/lib/crypto.c
-+++ b/grub-core/lib/crypto.c
-@@ -468,7 +468,7 @@ grub_password_get (char buf[], unsigned buf_size)
- 	  break;
- 	}
- 
--      if (key == '\b')
-+      if (key == '\b' && cur_len)
- 	{
- 	  if (cur_len)
- 	    cur_len--;
-diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
-index 6be678c0d..c35ce9724 100644
---- a/grub-core/normal/auth.c
-+++ b/grub-core/normal/auth.c
-@@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size)
- 	  break;
- 	}
- 
--      if (key == GRUB_TERM_BACKSPACE)
-+      if (key == GRUB_TERM_BACKSPACE && cur_len)
- 	{
- 	  if (cur_len)
- 	    {

SOURCES/0068-Warn-if-grub-password-will-not-be-read-1290803.patch

@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Robert Marshall <rmarshall@redhat.com>
-Date: Mon, 22 Feb 2016 15:30:05 -0500
-Subject: [PATCH] Warn if grub password will not be read (#1290803)
-
-It is possible for a system to have never run grub-mkconfig and add the
-section that reads the user.cfg file which contains a user set GRUB
-password. Users in that scenario will now be warned that grub-mkconfig
-must be run prior to their newly set password taking effect.
-
-Resolves: rhbz#1290803
----
- util/grub-setpassword.in | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
-index dd76f00fc..fb9d3a3b6 100644
---- a/util/grub-setpassword.in
-+++ b/util/grub-setpassword.in
-@@ -121,3 +121,8 @@ fi
- install -m 0600 /dev/null "${grubdir}/user.cfg" 2>/dev/null || :
- chmod 0600 "${grubdir}/user.cfg" 2>/dev/null || :
- echo "GRUB2_PASSWORD=${MYPASS}" > "${grubdir}/user.cfg"
-+
-+if ! grep -q "^### BEGIN /etc/grub.d/01_users ###$" "${grubdir}/grub.cfg"; then
-+    echo "WARNING: The current configuration lacks password support!"
-+    echo "Update your configuration with @grub_mkconfig@ to support this feature."
-+fi

SOURCES/0068-don-t-use-int-for-efi-status.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] don't use int for efi status
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 562d6887e..bcae7f469 100644
+index 05d8237a9b2..ae9885edb84 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -166,7 +166,7 @@ grub_reboot (void)
+@@ -167,7 +167,7 @@ grub_reboot (void)
  void
  grub_exit (int retval)
  {

SOURCES/0069-Clean-up-grub-setpassword-documentation-1290799.patch

@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Robert Marshall <rmarshall@redhat.com>
-Date: Tue, 26 Jan 2016 10:28:35 -0500
-Subject: [PATCH] Clean up grub-setpassword documentation (#1290799)
-
-The output for --help had some errors. Corrected those and polished the
-text to be a little easier to follow. Carried verbage over to man page
-to maintain internal consistency.
-
-Resolves: rhbz#1290799
----
- util/grub-setpassword.8  |  2 +-
- util/grub-setpassword.in | 15 +++++++--------
- 2 files changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/util/grub-setpassword.8 b/util/grub-setpassword.8
-index 49200a848..dc91dd669 100644
---- a/util/grub-setpassword.8
-+++ b/util/grub-setpassword.8
-@@ -19,7 +19,7 @@ Display program usage and exit.
- -v, --version
- Display the current version.
- .TP
---o, --output[=\fIDIRECTORY PATH\fR]
-+-o, --output=<\fIDIRECTORY\fR>
- Choose the file path to which user.cfg will be written.
- 
- .SH SEE ALSO
-diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
-index fb9d3a3b6..c8c0fa419 100644
---- a/util/grub-setpassword.in
-+++ b/util/grub-setpassword.in
-@@ -16,15 +16,14 @@ grub_mkpasswd="${bindir}/@grub_mkpasswd_pbkdf2@"
- # Print the usage.
- usage () {
-     cat <<EOF
--Usage: $0 [OPTION] [SOURCE]
--Run GRUB script in a Qemu instance.
--
--  -h, --help              print this message and exit
--  -v, --version           print the version information and exit
--  -o, --output_path       choose a custom output path for user.cfg
--
-+Usage: $0 [OPTION]
- $0 prompts the user to set a password on the grub bootloader. The password
--is written to a file named user.cfg.
-+is written to a file named user.cfg which lives in the GRUB directory
-+located by default at ${grubdir}.
-+
-+  -h, --help                     print this message and exit
-+  -v, --version                  print the version information and exit
-+  -o, --output_path <DIRECTORY>  put user.cfg in a user-selected directory
- 
- Report bugs at https://bugzilla.redhat.com.
- EOF

SOURCES/0069-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] make GRUB_MOD_INIT() declare its function prototypes.
  1 file changed, 2 insertions(+)
 
 diff --git a/include/grub/dl.h b/include/grub/dl.h
-index 2bca56ce0..b1ed3c333 100644
+index b3753c9ca26..91933b85f2c 100644
 --- a/include/grub/dl.h
 +++ b/include/grub/dl.h
 @@ -54,6 +54,7 @@ grub_mod_fini (void)

SOURCES/0070-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch

@@ -16,10 +16,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 11 deletions(-)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
-index a0ad99729..16f137ca8 100644
+index 84ed6e88ecb..a2bec7446cb 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
-@@ -1159,18 +1159,8 @@ main (int argc, char *argv[])
+@@ -1190,18 +1190,8 @@ main (int argc, char *argv[])
  	  char *d;
  
  	  is_guess = 1;

SOURCES/0070-Fix-locale-issue-in-grub-setpassword-1294243.patch

@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Robert Marshall <rmarshall@redhat.com>
-Date: Fri, 29 Jan 2016 16:56:11 -0500
-Subject: [PATCH] Fix locale issue in grub-setpassword (#1294243)
-
-A shell substitution was expecting non-translated output to grab the
-hashed password and put it in the user.cfg file. Modified code to force
-the generic C locale when this particular piece of code is run.
-
-Resolves: rhbz#1294243
----
- util/grub-setpassword.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
-index c8c0fa419..d7924af51 100644
---- a/util/grub-setpassword.in
-+++ b/util/grub-setpassword.in
-@@ -104,7 +104,7 @@ getpass() {
-     P1="$1" && shift
- 
-     ( echo ${P0} ; echo ${P1} ) | \
--        ${grub_mkpasswd} | \
-+        LC_ALL=C ${grub_mkpasswd} | \
-         grep -v '[eE]nter password:' | \
-         sed -e "s/PBKDF2 hash of your password is //"
- }

SOURCES/0071-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch

@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 9 Jul 2019 14:31:19 +0200
+Subject: [PATCH] 20_linux_xen: load xen or multiboot{,2} modules as needed.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ util/grub.d/20_linux_xen.in | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
+index e9e73b815fb..c23b064be6c 100644
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -153,6 +153,7 @@ linux_entry_xsm ()
+         else
+             xen_rm_opts="no-real-mode edd=off"
+         fi
++	insmod ${xen_module}
+ 	${xen_loader}	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
+ 	echo	'$(echo "$lmessage" | grub_quote)'
+ 	${module_loader}	${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
+@@ -166,6 +167,7 @@ EOF
+     done
+     sed "s/^/$submenu_indentation/" << EOF
+ 	echo	'$(echo "$message" | grub_quote)'
++	insmod ${xen_module}
+ 	${module_loader}	--nounzip   $(echo $initrd_path)
+ EOF
+   fi
+@@ -253,13 +255,16 @@ while [ "x${xen_list}" != "x" ] ; do
+ 	echo "	submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {"
+     fi
+     if ($grub_file --is-arm64-efi $current_xen); then
++	xen_module="xen_boot"
+ 	xen_loader="xen_hypervisor"
+ 	module_loader="xen_module"
+     else
+ 	if ($grub_file --is-x86-multiboot2 $current_xen); then
++	    xen_module="multiboot2"
+ 	    xen_loader="multiboot2"
+ 	    module_loader="module2"
+ 	else
++	    xen_module="multiboot"
+ 	    xen_loader="multiboot"
+ 	    module_loader="module"
+         fi