Fix module loading in the 20_linux_xen script

Resolves: rhbz#1858364

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>

.gitignore

@@ -1,7 +1,7 @@
 grub-*.tar.?z
 *.rpm
 clog
-/unifont-*.pcf.?z
+/unifont-5.1.20080820.pcf.gz
 /theme.tar.bz2
 kojilogs
 /grub-*/

0001-Add-support-for-Linux-EFI-stub-loading.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
-Date: Mon, 1 Apr 2024 13:20:18 -0600
+Date: Fri, 5 Jul 2019 18:36:44 +0200
 Subject: [PATCH] Add support for Linux EFI stub loading.
 
 Also:
@@ -26,25 +26,32 @@ grub-2.00-no-insmod-on-sb.patch), but this should be more correct.  It
 moves the check into grub_dl_load_file.
 ---
  grub-core/Makefile.core.def       |  16 +-
- grub-core/kern/dl.c               |  22 +++
+ grub-core/kern/dl.c               |  21 +++
+ grub-core/kern/efi/efi.c          |  28 ++++
  grub-core/kern/efi/mm.c           |  32 ++++
- grub-core/loader/efi/linux.c      |  47 ++++++
+ grub-core/loader/arm64/linux.c    | 118 +++++++-------
+ grub-core/loader/arm64/xen_boot.c |   1 -
+ grub-core/loader/efi/linux.c      |  70 ++++++++
  grub-core/loader/i386/efi/linux.c | 335 ++++++++++++++++++++++++++++++++++++++
  grub-core/loader/i386/pc/linux.c  |  10 +-
- include/grub/efi/efi.h            |   3 +
+ include/grub/arm/linux.h          |   9 +
+ include/grub/arm64/linux.h        |  10 ++
+ include/grub/efi/efi.h            |   7 +-
  include/grub/efi/linux.h          |  31 ++++
- 8 files changed, 485 insertions(+), 11 deletions(-)
+ 13 files changed, 619 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 a5a3ee31800..3f6e944d6a5 100644
+index 474a63e68c5..581d9dfc3b3 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -1831,12 +1831,6 @@ module = {
+@@ -1709,13 +1709,6 @@ module = {
+   enable = i386_pc;
  };
  
- 
+-
 -module = {
 -  name = linux16;
 -  common = loader/i386/pc/linux.c;
@@ -54,47 +61,37 @@ index a5a3ee31800..3f6e944d6a5 100644
  module = {
    name = ntldr;
    i386_pc = loader/i386/pc/ntldr.c;
-@@ -1892,10 +1886,9 @@ module = {
+@@ -1771,7 +1764,9 @@ module = {
  
  module = {
    name = linux;
 -  x86 = loader/i386/linux.c;
++  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;
-+  i386_pc = loader/i386/pc/linux.c;
-   i386_xen_pvh = lib/i386/pc/vesa_modes_table.c;
-   mips = loader/mips/linux.c;
-   powerpc_ieee1275 = loader/powerpc/ieee1275/linux.c;
-@@ -1908,11 +1901,14 @@ module = {
-   loongarch64 = loader/efi/linux.c;
-   riscv32 = loader/efi/linux.c;
-   riscv64 = loader/efi/linux.c;
--  i386_efi = loader/efi/linux.c;
--  x86_64_efi = loader/efi/linux.c;
-+  i386_efi = loader/i386/efi/linux.c;
-+  x86_64_efi = loader/i386/efi/linux.c;
-   emu = loader/emu/linux.c;
+   i386_pc = lib/i386/pc/vesa_modes_table.c;
+@@ -1786,9 +1781,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;
++
    common = loader/linux.c;
    common = lib/cmdline.c;
+   enable = noemu;
++
 +  efi = loader/efi/linux.c;
-+  efi = loader/i386/linux.c;
  };
  
  module = {
 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index c55f0ecf931..d48d4131ba7 100644
+index 48eb5e7b627..896bebfd57e 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
-@@ -32,12 +32,21 @@
- #include <grub/env.h>
- #include <grub/cache.h>
- #include <grub/i18n.h>
-+#include <grub/efi/sb.h>
- 
- /* Platforms where modules are in a readonly area of memory.  */
- #if defined(GRUB_MACHINE_QEMU)
+@@ -38,6 +38,14 @@
  #define GRUB_MODULES_MACHINE_READONLY
  #endif
  
@@ -109,12 +106,12 @@ index c55f0ecf931..d48d4131ba7 100644
  
  
  #pragma GCC diagnostic ignored "-Wcast-align"
-@@ -861,6 +870,19 @@ grub_dl_load_file (const char *filename)
+@@ -686,6 +694,19 @@ grub_dl_load_file (const char *filename)
    void *core = 0;
    grub_dl_t mod = 0;
  
 +#ifdef GRUB_MACHINE_EFI
-+  if (grub_efi_get_secureboot ())
++  if (grub_efi_secure_boot ())
 +    {
 +#if 0
 +      /* This is an error, but grub2-mkconfig still generates a pile of
@@ -129,11 +126,50 @@ index c55f0ecf931..d48d4131ba7 100644
    grub_boot_time ("Loading module %s", 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 6e1ceb90516..a0faa40ecf0 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;
+ }
+ 
++grub_efi_boolean_t
++grub_efi_secure_boot (void)
++{
++  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)
++    goto out;
++
++  setup_mode = grub_efi_get_variable("SetupMode", &efi_var_guid, &datasize);
++
++  if (datasize != 1 || !setup_mode)
++    goto out;
++
++  if (*secure_boot && !*setup_mode)
++    ret = 1;
++
++ out:
++  grub_free (secure_boot);
++  grub_free (setup_mode);
++  return ret;
++}
++
+ #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/mm.c b/grub-core/kern/efi/mm.c
-index df443f434d4..fb9dbf52528 100644
+index b02fab1b102..a9e37108c6d 100644
 --- a/grub-core/kern/efi/mm.c
 +++ b/grub-core/kern/efi/mm.c
-@@ -112,6 +112,38 @@ grub_efi_drop_alloc (grub_efi_physical_address_t address,
+@@ -113,6 +113,38 @@ grub_efi_drop_alloc (grub_efi_physical_address_t address,
      }
  }
  
@@ -150,7 +186,7 @@ index df443f434d4..fb9dbf52528 100644
 +    return 0;
 +
 +  b = grub_efi_system_table->boot_services;
-+  status = b->allocate_pages (GRUB_EFI_ALLOCATE_MAX_ADDRESS, GRUB_EFI_LOADER_DATA, pages, &address);
++  status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_MAX_ADDRESS, GRUB_EFI_LOADER_DATA, pages, &address);
 +
 +  if (status != GRUB_EFI_SUCCESS)
 +    return 0;
@@ -160,7 +196,7 @@ index df443f434d4..fb9dbf52528 100644
 +      /* Uggh, the address 0 was allocated... This is too annoying,
 +	 so reallocate another one.  */
 +      address = max;
-+      status = b->allocate_pages (GRUB_EFI_ALLOCATE_MAX_ADDRESS, GRUB_EFI_LOADER_DATA, pages, &address);
++      status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_MAX_ADDRESS, GRUB_EFI_LOADER_DATA, pages, &address);
 +      grub_efi_free_pages (0, pages);
 +      if (status != GRUB_EFI_SUCCESS)
 +	return 0;
@@ -172,27 +208,231 @@ index df443f434d4..fb9dbf52528 100644
  /* Allocate pages. Return the pointer to the first of allocated pages.  */
  void *
  grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
-diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index bfbd95aeef0..925394d1767 100644
---- a/grub-core/loader/efi/linux.c
-+++ b/grub-core/loader/efi/linux.c
-@@ -25,10 +25,12 @@
- #include <grub/loader.h>
- #include <grub/mm.h>
- #include <grub/types.h>
-+#include <grub/cpu/linux.h>
+diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
+index ef3e9f9444c..a312c668685 100644
+--- a/grub-core/loader/arm64/linux.c
++++ b/grub-core/loader/arm64/linux.c
+@@ -29,6 +29,7 @@
  #include <grub/efi/efi.h>
  #include <grub/efi/fdtload.h>
  #include <grub/efi/memory.h>
- #include <grub/efi/pe32.h>
 +#include <grub/efi/linux.h>
- #include <grub/efi/sb.h>
+ #include <grub/efi/pe32.h>
  #include <grub/i18n.h>
  #include <grub/lib/cmdline.h>
-@@ -87,6 +89,51 @@ static grub_efi_load_file2_t initrd_lf2 = {
-   grub_efi_initrd_load_file2
- };
+@@ -41,6 +42,7 @@ static int loaded;
  
+ static void *kernel_addr;
+ static grub_uint64_t kernel_size;
++static grub_uint32_t handover_offset;
+ 
+ static char *linux_args;
+ static grub_uint32_t cmdline_size;
+@@ -67,7 +69,8 @@ grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
+ static grub_err_t
+ finalize_params_linux (void)
+ {
+-  int node, retval;
++  grub_efi_loaded_image_t *loaded_image = NULL;
++  int node, retval, len;
+ 
+   void *fdt;
+ 
+@@ -102,79 +105,70 @@ finalize_params_linux (void)
+   if (grub_fdt_install() != GRUB_ERR_NONE)
+     goto failure;
+ 
+-  return GRUB_ERR_NONE;
+-
+-failure:
+-  grub_fdt_unload();
+-  return grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT");
+-}
+-
+-grub_err_t
+-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;
+-  grub_efi_boot_services_t *b;
+-  grub_efi_status_t status;
+-  grub_efi_loaded_image_t *loaded_image;
+-  int len;
+-
+-  mempath = grub_malloc (2 * sizeof (grub_efi_memory_mapped_device_path_t));
+-  if (!mempath)
+-    return grub_errno;
+-
+-  mempath[0].header.type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE;
+-  mempath[0].header.subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE;
+-  mempath[0].header.length = grub_cpu_to_le16_compile_time (sizeof (*mempath));
+-  mempath[0].memory_type = GRUB_EFI_LOADER_DATA;
+-  mempath[0].start_address = addr;
+-  mempath[0].end_address = addr + size;
+-
+-  mempath[1].header.type = GRUB_EFI_END_DEVICE_PATH_TYPE;
+-  mempath[1].header.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
+-  mempath[1].header.length = sizeof (grub_efi_device_path_t);
+-
+-  b = grub_efi_system_table->boot_services;
+-  status = b->load_image (0, grub_efi_image_handle,
+-			  (grub_efi_device_path_t *) mempath,
+-			  (void *) addr, size, &image_handle);
+-  if (status != GRUB_EFI_SUCCESS)
+-    return grub_error (GRUB_ERR_BAD_OS, "cannot load image");
+-
+-  grub_dprintf ("linux", "linux command line: '%s'\n", args);
++  grub_dprintf ("linux", "Installed/updated FDT configuration table @ %p\n",
++                fdt);
+ 
+   /* Convert command line to UCS-2 */
+-  loaded_image = grub_efi_get_loaded_image (image_handle);
++  loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle);
++  if (!loaded_image)
++    goto failure;
++
+   loaded_image->load_options_size = len =
+-    (grub_strlen (args) + 1) * sizeof (grub_efi_char16_t);
++    (grub_strlen (linux_args) + 1) * sizeof (grub_efi_char16_t);
+   loaded_image->load_options =
+     grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
+   if (!loaded_image->load_options)
+-    return grub_errno;
++    return grub_error(GRUB_ERR_BAD_OS, "failed to create kernel parameters");
+ 
+   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_dprintf ("linux", "starting image %p\n", image_handle);
+-  status = b->start_image (image_handle, 0, NULL);
++  return GRUB_ERR_NONE;
+ 
+-  /* When successful, not reached */
+-  b->unload_image (image_handle);
+-  grub_efi_free_pages ((grub_addr_t) loaded_image->load_options,
+-		       GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
++failure:
++  grub_fdt_unload();
++  return grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT");
++}
+ 
+-  return grub_errno;
++static void
++free_params (void)
++{
++  grub_efi_loaded_image_t *loaded_image = NULL;
++
++  loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle);
++  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));
++      loaded_image->load_options = NULL;
++      loaded_image->load_options_size = 0;
++    }
++}
++
++grub_err_t
++grub_arch_efi_linux_boot_image (grub_addr_t addr, char *args)
++{
++  grub_err_t retval;
++
++  retval = finalize_params_linux ();
++  if (retval != GRUB_ERR_NONE)
++    return grub_errno;
++
++  grub_dprintf ("linux", "linux command line: '%s'\n", args);
++
++  retval = grub_efi_linux_boot ((char *)addr, handover_offset, (void *)addr);
++
++  /* Never reached... */
++  free_params();
++  return retval;
+ }
+ 
+ static grub_err_t
+ grub_linux_boot (void)
+ {
+-  if (finalize_params_linux () != GRUB_ERR_NONE)
+-    return grub_errno;
+-
+-  return (grub_arch_efi_linux_boot_image((grub_addr_t)kernel_addr,
+-                                          kernel_size, linux_args));
++  return (grub_arch_efi_linux_boot_image((grub_addr_t)kernel_addr, linux_args));
+ }
+ 
+ static grub_err_t
+@@ -288,6 +282,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ {
+   grub_file_t file = 0;
+   struct linux_arch_kernel_header lh;
++  struct grub_armxx_linux_pe_header *pe;
+   grub_err_t err;
+ 
+   grub_dl_ref (my_mod);
+@@ -333,6 +328,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ 
+   grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
+ 
++  if (!grub_linuxefi_secure_validate (kernel_addr, kernel_size))
++    {
++      grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]);
++      goto fail;
++    }
++
++  pe = (void *)((unsigned long)kernel_addr + lh.hdr_offset);
++  handover_offset = pe->opt.entry_addr;
++
+   cmdline_size = grub_loader_cmdline_size (argc, argv) + sizeof (LINUX_IMAGE);
+   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 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_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 00000000000..c24202a5dd1
+--- /dev/null
++++ b/grub-core/loader/efi/linux.c
+@@ -0,0 +1,70 @@
++/*
++ *  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>
++
 +#define SHIM_LOCK_GUID \
 + { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} }
 +
@@ -205,7 +445,7 @@ index bfbd95aeef0..925394d1767 100644
 +grub_efi_boolean_t
 +grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
 +{
-+  grub_guid_t guid = SHIM_LOCK_GUID;
++  grub_efi_guid_t guid = SHIM_LOCK_GUID;
 +  grub_efi_shim_lock_t *shim_lock;
 +
 +  shim_lock = grub_efi_locate_protocol(&guid, NULL);
@@ -225,25 +465,21 @@ index bfbd95aeef0..925394d1767 100644
 +typedef void (*handover_func) (void *, grub_efi_system_table_t *, void *);
 +
 +grub_err_t
-+grub_efi_linux_boot (void *kernel_address, grub_off_t offset,
++grub_efi_linux_boot (void *kernel_addr, grub_off_t offset,
 +		     void *kernel_params)
 +{
 +  handover_func hf;
 +
-+  hf = (handover_func)((char *)kernel_address + offset);
++  hf = (handover_func)((char *)kernel_addr + offset);
 +  hf (grub_efi_image_handle, grub_efi_system_table, kernel_params);
 +
 +  return GRUB_ERR_BUG;
 +}
 +
 +#pragma GCC diagnostic pop
-+
- grub_err_t
- grub_arch_efi_linux_load_image_header (grub_file_t file,
-                                       struct linux_arch_kernel_header * lh)
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
 new file mode 100644
-index 00000000000..9bfb4ab9e3e
+index 00000000000..bb2616a8092
 --- /dev/null
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -0,0 +1,335 @@
@@ -301,7 +537,7 @@ index 00000000000..9bfb4ab9e3e
 +  asm volatile ("cli");
 +
 +  return grub_efi_linux_boot ((char *)kernel_mem, handover_offset + offset,
-+                              params);
++			      params);
 +}
 +
 +static grub_err_t
@@ -311,17 +547,17 @@ index 00000000000..9bfb4ab9e3e
 +  loaded = 0;
 +  if (initrd_mem)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)initrd_mem,
-+                         BYTES_TO_PAGES(params->ramdisk_size));
++			 BYTES_TO_PAGES(params->ramdisk_size));
 +  if (linux_cmdline)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)
-+                         linux_cmdline,
-+                         BYTES_TO_PAGES(params->cmdline_size + 1));
++			 linux_cmdline,
++			 BYTES_TO_PAGES(params->cmdline_size + 1));
 +  if (kernel_mem)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,
-+                         BYTES_TO_PAGES(kernel_size));
++			 BYTES_TO_PAGES(kernel_size));
 +  if (params)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)params,
-+                         BYTES_TO_PAGES(16384));
++			 BYTES_TO_PAGES(16384));
 +  return GRUB_ERR_NONE;
 +}
 +
@@ -395,14 +631,14 @@ index 00000000000..9bfb4ab9e3e
 +
 +  if (initrd_mem && grub_errno)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)initrd_mem,
-+                         BYTES_TO_PAGES(size));
++			 BYTES_TO_PAGES(size));
 +
 +  return grub_errno;
 +}
 +
 +static grub_err_t
 +grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-+                int argc, char *argv[])
++		int argc, char *argv[])
 +{
 +  grub_file_t file = 0;
 +  struct linux_i386_kernel_header lh;
@@ -440,7 +676,7 @@ index 00000000000..9bfb4ab9e3e
 +  if (! grub_linuxefi_secure_validate (kernel, filelen))
 +    {
 +      grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"),
-+                  argv[0]);
++		  argv[0]);
 +      goto fail;
 +    }
 +
@@ -482,7 +718,7 @@ index 00000000000..9bfb4ab9e3e
 +
 +  grub_dprintf ("linux", "setting up cmdline\n");
 +  linux_cmdline = grub_efi_allocate_pages_max(0x3fffffff,
-+                                         BYTES_TO_PAGES(lh.cmdline_size + 1));
++					 BYTES_TO_PAGES(lh.cmdline_size + 1));
 +
 +  if (!linux_cmdline)
 +    {
@@ -493,8 +729,8 @@ index 00000000000..9bfb4ab9e3e
 +  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),
-+                              GRUB_VERIFY_KERNEL_CMDLINE);
++			      lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1),
++			      GRUB_VERIFY_KERNEL_CMDLINE);
 +
 +  lh.cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
 +
@@ -504,11 +740,11 @@ index 00000000000..9bfb4ab9e3e
 +  len = grub_file_size(file) - start;
 +
 +  kernel_mem = grub_efi_allocate_pages_max(lh.pref_address,
-+                                           BYTES_TO_PAGES(lh.init_size));
++					   BYTES_TO_PAGES(lh.init_size));
 +
 +  if (!kernel_mem)
 +    kernel_mem = grub_efi_allocate_pages_max(0x3fffffff,
-+                                             BYTES_TO_PAGES(lh.init_size));
++					     BYTES_TO_PAGES(lh.init_size));
 +
 +  if (!kernel_mem)
 +    {
@@ -541,16 +777,16 @@ index 00000000000..9bfb4ab9e3e
 +
 +  if (linux_cmdline && !loaded)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)
-+                         linux_cmdline,
-+                         BYTES_TO_PAGES(lh.cmdline_size + 1));
++			 linux_cmdline,
++			 BYTES_TO_PAGES(lh.cmdline_size + 1));
 +
 +  if (kernel_mem && !loaded)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,
-+                         BYTES_TO_PAGES(kernel_size));
++			 BYTES_TO_PAGES(kernel_size));
 +
 +  if (params && !loaded)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)params,
-+                         BYTES_TO_PAGES(16384));
++			 BYTES_TO_PAGES(16384));
 +
 +  return grub_errno;
 +}
@@ -583,10 +819,10 @@ index 00000000000..9bfb4ab9e3e
 +  grub_unregister_command (cmd_initrdefi);
 +}
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 600530a742b..8593d74737f 100644
+index 47ea2945e4f..eea25ea39ca 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
-@@ -483,14 +483,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+@@ -470,14 +470,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
    return grub_errno;
  }
  
@@ -608,7 +844,7 @@ index 600530a742b..8593d74737f 100644
      grub_register_command ("initrd16", grub_cmd_initrd,
  			   0, N_("Load initrd."));
    my_mod = mod;
-@@ -499,5 +505,7 @@ GRUB_MOD_INIT(linux16)
+@@ -486,5 +492,7 @@ GRUB_MOD_INIT(linux16)
  GRUB_MOD_FINI(linux16)
  {
    grub_unregister_command (cmd_linux);
@@ -616,11 +852,72 @@ index 600530a742b..8593d74737f 100644
    grub_unregister_command (cmd_initrd);
 +  grub_unregister_command (cmd_initrd16);
  }
+diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
+index 2e98a668969..775297db869 100644
+--- a/include/grub/arm/linux.h
++++ b/include/grub/arm/linux.h
+@@ -20,6 +20,7 @@
+ #ifndef GRUB_ARM_LINUX_HEADER
+ #define GRUB_ARM_LINUX_HEADER 1
+ 
++#include <grub/efi/pe32.h>
+ #include "system.h"
+ 
+ #define GRUB_LINUX_ARM_MAGIC_SIGNATURE 0x016f2818
+@@ -34,9 +35,17 @@ struct linux_arm_kernel_header {
+   grub_uint32_t hdr_offset;
+ };
+ 
++struct grub_arm_linux_pe_header
++{
++  grub_uint32_t magic;
++  struct grub_pe32_coff_header coff;
++  struct grub_pe32_optional_header opt;
++};
++
+ #if defined(__arm__)
+ # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM_MAGIC_SIGNATURE
+ # 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 4269adc6dae..a3be9dd7003 100644
+--- a/include/grub/arm64/linux.h
++++ b/include/grub/arm64/linux.h
+@@ -19,6 +19,8 @@
+ #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' */
+ 
+ /* From linux/Documentation/arm64/booting.txt */
+@@ -36,9 +38,17 @@ struct linux_arm64_kernel_header
+   grub_uint32_t hdr_offset;	/* Offset of PE/COFF header */
+ };
+ 
++struct grub_arm64_linux_pe_header
++{
++  grub_uint32_t magic;
++  struct grub_pe32_coff_header coff;
++  struct grub_pe64_optional_header opt;
++};
++
+ #if defined(__aarch64__)
+ # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM64_MAGIC_SIGNATURE
+ # 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 3670eddc52b..83ddbe26e57 100644
+index e90e00dc431..6840bfee9b7 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
-@@ -75,6 +75,9 @@ EXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,
+@@ -47,6 +47,9 @@ EXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,
  				      grub_efi_uintn_t pages);
  void *
  EXPORT_FUNC(grub_efi_allocate_any_pages) (grub_efi_uintn_t pages);
@@ -630,9 +927,27 @@ index 3670eddc52b..83ddbe26e57 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,
+ 				     const grub_efi_guid_t *guid,
+ 				     void *data,
+ 				     grub_size_t datasize);
++grub_efi_boolean_t EXPORT_FUNC (grub_efi_secure_boot) (void);
+ 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);
+ grub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t *);
+ #include <grub/cpu/linux.h>
+ 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_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 00000000000..d224daafa4f
+index 00000000000..d9ede36773b
 --- /dev/null
 +++ b/include/grub/efi/linux.h
 @@ -0,0 +1,31 @@
@@ -664,6 +979,6 @@ index 00000000000..d224daafa4f
 +EXPORT_FUNC(grub_linuxefi_secure_validate) (void *data, grub_uint32_t size);
 +grub_err_t
 +EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset,
-+                                  void *kernel_param);
++				  void *kernel_param);
 +
 +#endif /* ! GRUB_EFI_LINUX_HEADER */

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

@@ -1,24 +0,0 @@
-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 656301eaf22..376ca47efe4 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

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

@@ -1,71 +0,0 @@
-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 32c480daeb2..7516a015be0 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 \
-@@ -250,6 +246,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 376ca47efe4..30f27f15b83 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() {

0002-Rework-linux-command.patch

@@ -1,22 +1,20 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
-Date: Sun, 9 Aug 2015 16:12:39 -0700
+Date: Fri, 5 Jul 2019 20:54:51 +0200
 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 | 35 +++++++++++++++++++++++------------
- 1 file changed, 23 insertions(+), 12 deletions(-)
+ grub-core/loader/i386/linux.c | 36 +++++++++++++++++++++++-------------
+ 1 file changed, 23 insertions(+), 13 deletions(-)
 
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 977757f2cc9..10f967f2563 100644
+index d0501e22957..b255c950526 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
-@@ -661,13 +661,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -641,13 +641,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  {
    grub_file_t file = 0;
    struct linux_i386_kernel_header lh;
@@ -33,7 +31,7 @@ index 977757f2cc9..10f967f2563 100644
  
    grub_dl_ref (my_mod);
  
-@@ -681,7 +683,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -661,7 +663,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    if (! file)
      goto fail;
  
@@ -50,7 +48,7 @@ index 977757f2cc9..10f967f2563 100644
      {
        if (!grub_errno)
  	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
-@@ -689,6 +699,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -669,6 +679,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -60,25 +58,32 @@ index 977757f2cc9..10f967f2563 100644
    if (lh.boot_flag != grub_cpu_to_le16_compile_time (0xaa55))
      {
        grub_error (GRUB_ERR_BAD_OS, "invalid magic number");
-@@ -796,13 +809,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -760,6 +773,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ 		      preferred_address))
+     goto fail;
+ 
++
+   grub_memset (&linux_params, 0, sizeof (linux_params));
+   grub_memcpy (&linux_params.setup_sects, &lh.setup_sects, sizeof (lh) - 0x1F1);
+ 
+@@ -782,13 +796,9 @@ 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);
  
--  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_file_read (file, (char *) &linux_params + sizeof (lh), len) != len)
+-    {
 -      if (!grub_errno)
 -	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
 -		    argv[0]);
 -      goto fail;
-+      grub_memcpy (linux_params_ptr + sizeof (lh), kernel + kernel_offset, len);
-+      kernel_offset += len;
-     }
+-    }
++  linux_params_ptr = (void *)&linux_params;
++  grub_memcpy (linux_params_ptr + sizeof (lh), kernel + kernel_offset, len);
++  kernel_offset += len;
  
-   linux_params.code32_start = prot_mode_target + lh.code32_start - GRUB_LINUX_BZIMAGE_ADDR;
-@@ -865,7 +876,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+   linux_params.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE;
+ 
+@@ -847,7 +857,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
    /* The other parameters are filled when booting.  */
  
@@ -87,7 +92,7 @@ index 977757f2cc9..10f967f2563 100644
  
    grub_dprintf ("linux", "bzImage, setup=0x%x, size=0x%x\n",
  		(unsigned) real_size, (unsigned) prot_size);
-@@ -1019,9 +1030,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -1001,9 +1011,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    }
  
    len = prot_file_size;
@@ -98,7 +103,7 @@ index 977757f2cc9..10f967f2563 100644
  
    if (grub_errno == GRUB_ERR_NONE)
      {
-@@ -1032,6 +1041,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -1014,6 +1022,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
   fail:
  

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

@@ -1,70 +0,0 @@
-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 a225f9a88d2..974bc0ddb07 100644
---- a/docs/grub.texi
-+++ b/docs/grub.texi
-@@ -1552,13 +1552,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
-@@ -1889,9 +1886,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 30f27f15b83..f300e46fc6a 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() {

0003-Rework-linux16-command.patch

@@ -1,22 +1,20 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
-Date: Sun, 9 Aug 2015 16:20:58 -0700
+Date: Fri, 5 Jul 2019 21:12:00 +0200
 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 | 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 4adeee9ae00..600530a742b 100644
+index eea25ea39ca..73fb91e0570 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
-@@ -124,13 +124,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -123,13 +123,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;
@@ -32,7 +30,7 @@ index 4adeee9ae00..600530a742b 100644
  
    grub_dl_ref (my_mod);
  
-@@ -144,7 +145,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -143,7 +144,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    if (! file)
      goto fail;
  
@@ -49,7 +47,7 @@ index 4adeee9ae00..600530a742b 100644
      {
        if (!grub_errno)
  	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
-@@ -152,6 +161,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -151,6 +160,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -59,7 +57,7 @@ index 4adeee9ae00..600530a742b 100644
    if (lh.boot_flag != grub_cpu_to_le16_compile_time (0xaa55))
      {
        grub_error (GRUB_ERR_BAD_OS, "invalid magic number");
-@@ -320,13 +332,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -314,13 +326,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);
@@ -76,7 +74,7 @@ index 4adeee9ae00..600530a742b 100644
  
    if (lh.header != grub_cpu_to_le32_compile_time (GRUB_LINUX_I386_MAGIC_SIGNATURE)
        || grub_le_to_cpu16 (lh.version) < 0x0200)
-@@ -364,9 +372,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -358,9 +366,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    }
  
    len = grub_linux16_prot_size;
@@ -88,7 +86,7 @@ index 4adeee9ae00..600530a742b 100644
  
    if (grub_errno == GRUB_ERR_NONE)
      {
-@@ -376,6 +383,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -370,6 +377,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
   fail:
  

0004-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: Tue, 2 Apr 2024 16:39:53 -0600
+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
@@ -164,93 +164,112 @@ following branches:
 
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1347291
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
-
-Also:
-
-commit cc06f149fbd2d8c1da1e83173d21629ba97e0d92
-Author: Raymund Will <rw@suse.com>
-
-chainloader: Define machine types for RISC-V
-
-The commit "Add secureboot support on efi chainloader" didn't add machine
-types for RISC-V, so this patch adds them.
-
-Note, that grub-core/loader/riscv/linux.c is skipped because Linux is not
-supported yet. This patch might need a new revision once that's the case.
-
-Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
 ---
- grub-core/loader/efi/chainloader.c | 849 +++++++++++++++++++++++++++++++++----
+ 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/linux.c       |  25 +-
  grub-core/loader/i386/efi/linux.c  |  17 +-
  include/grub/efi/linux.h           |   2 +-
- include/grub/efi/pe32.h            |  51 ++-
- 5 files changed, 848 insertions(+), 96 deletions(-)
+ include/grub/efi/pe32.h            |  52 ++-
+ 7 files changed, 840 insertions(+), 91 deletions(-)
 
+diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
+index a0faa40ecf0..3487b0623a4 100644
+--- a/grub-core/kern/efi/efi.c
++++ b/grub-core/kern/efi/efi.c
+@@ -283,14 +283,20 @@ grub_efi_secure_boot (void)
+   grub_efi_boolean_t ret = 0;
+ 
+   secure_boot = grub_efi_get_variable("SecureBoot", &efi_var_guid, &datasize);
+-
+   if (datasize != 1 || !secure_boot)
+-    goto out;
++    {
++      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)
+-    goto out;
++    {
++      grub_dprintf ("secureboot", "No SetupMode variable\n");
++      goto out;
++    }
++  grub_dprintf ("secureboot", "SetupMode: %d\n", *setup_mode);
+ 
+   if (*secure_boot && !*setup_mode)
+     ret = 1;
+diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
+index a312c668685..04994d5c67d 100644
+--- a/grub-core/loader/arm64/linux.c
++++ b/grub-core/loader/arm64/linux.c
+@@ -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);
+ 
+@@ -328,7 +329,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ 
+   grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
+ 
+-  if (!grub_linuxefi_secure_validate (kernel_addr, kernel_size))
++  rc = grub_linuxefi_secure_validate (kernel_addr, kernel_size);
++  if (rc < 0)
+     {
+       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 2036924504b..e4ac39c87b4 100644
+index cd92ea3f24b..ef87b06cf70 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
-@@ -32,6 +32,9 @@
+@@ -32,6 +32,8 @@
  #include <grub/efi/api.h>
  #include <grub/efi/efi.h>
  #include <grub/efi/disk.h>
 +#include <grub/efi/pe32.h>
-+#include <grub/efi/sb.h>
 +#include <grub/efi/linux.h>
- #include <grub/efi/memory.h>
  #include <grub/command.h>
  #include <grub/i18n.h>
-@@ -45,13 +48,24 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ #include <grub/net.h>
+@@ -46,9 +48,14 @@ static grub_dl_t my_mod;
  
- static grub_dl_t my_mod;
- 
-+static grub_efi_physical_address_t address;
-+static grub_efi_uintn_t pages;
+ static grub_efi_physical_address_t address;
+ static grub_efi_uintn_t pages;
 +static grub_ssize_t fsize;
-+static grub_efi_device_path_t *file_path;
-+static grub_efi_handle_t image_handle;
-+static grub_efi_char16_t *cmdline;
+ static grub_efi_device_path_t *file_path;
+ static grub_efi_handle_t image_handle;
+ static grub_efi_char16_t *cmdline;
 +static grub_ssize_t cmdline_len;
 +static grub_efi_handle_t dev_handle;
 +
-+static grub_efi_status_t (__grub_efi_api *entry_point) (grub_efi_handle_t image_handle, grub_efi_system_table_t *system_table);
-+
++static grub_efi_status_t (*entry_point) (grub_efi_handle_t image_handle, grub_efi_system_table_t *system_table);
+ 
  static grub_err_t
- grub_chainloader_unload (void *context)
- {
--  grub_efi_handle_t image_handle = (grub_efi_handle_t) context;
-   grub_efi_loaded_image_t *loaded_image;
-   grub_efi_boot_services_t *b;
+ grub_chainloader_unload (void)
+@@ -63,6 +70,7 @@ grub_chainloader_unload (void)
+   grub_free (cmdline);
+   cmdline = 0;
+   file_path = 0;
++  dev_handle = 0;
  
-+  image_handle = (grub_efi_handle_t) context;
-   loaded_image = grub_efi_get_loaded_image (image_handle);
-   if (loaded_image != NULL)
-     grub_free (loaded_image->load_options);
-@@ -66,12 +80,12 @@ grub_chainloader_unload (void *context)
- static grub_err_t
- grub_chainloader_boot (void *context)
- {
--  grub_efi_handle_t image_handle = (grub_efi_handle_t) context;
-   grub_efi_boot_services_t *b;
-   grub_efi_status_t status;
-   grub_efi_uintn_t exit_data_size;
-   grub_efi_char16_t *exit_data = NULL;
+   grub_dl_unref (my_mod);
+   return GRUB_ERR_NONE;
+@@ -179,7 +187,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);
  
-+  image_handle = (grub_efi_handle_t) context;
-   b = grub_efi_system_table->boot_services;
-   status = b->start_image (image_handle, &exit_data_size, &exit_data);
-   if (status != GRUB_EFI_SUCCESS)
-@@ -136,7 +150,7 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
-   char *dir_start;
-   char *dir_end;
-   grub_size_t size;
--  grub_efi_device_path_t *d, *file_path;
-+  grub_efi_device_path_t *d;
- 
-   dir_start = grub_strchr (filename, ')');
-   if (! dir_start)
-@@ -209,24 +223,701 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
+@@ -197,20 +204,690 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
    return file_path;
  }
  
@@ -301,7 +320,7 @@ index 2036924504b..e4ac39c87b4 100644
 +read_header (void *data, grub_efi_uint32_t size,
 +	     pe_coff_loader_image_context_t *context)
 +{
-+  grub_guid_t guid = SHIM_LOCK_GUID;
++  grub_efi_guid_t guid = SHIM_LOCK_GUID;
 +  grub_efi_shim_lock_t *shim_lock;
 +  grub_efi_status_t status;
 +
@@ -365,10 +384,6 @@ index 2036924504b..e4ac39c87b4 100644
 +  GRUB_PE32_MACHINE_I386;
 +#elif defined(__ia64__)
 +  GRUB_PE32_MACHINE_IA64;
-+#elif defined(__riscv) && (__riscv_xlen == 32)
-+  GRUB_PE32_MACHINE_RISCV32;
-+#elif defined(__riscv) && (__riscv_xlen == 64)
-+  GRUB_PE32_MACHINE_RISCV64;
 +#else
 +#error this architecture is not supported by grub2
 +#endif
@@ -614,8 +629,8 @@ index 2036924504b..e4ac39c87b4 100644
 +  grub_dprintf ("chain", "image size is %08"PRIxGRUB_UINT64_T", datasize is %08x\n",
 +	       context.image_size, datasize);
 +
-+  efi_status = b->allocate_pool (GRUB_EFI_LOADER_DATA,
-+                                 buffer_size, (void**)&buffer);
++  efi_status = efi_call_3 (b->allocate_pool, GRUB_EFI_LOADER_DATA,
++			   buffer_size, &buffer);
 +
 +  if (efi_status != GRUB_EFI_SUCCESS)
 +    {
@@ -842,19 +857,19 @@ index 2036924504b..e4ac39c87b4 100644
 +    }
 +
 +  grub_dprintf ("chain", "booting via entry point\n");
-+  efi_status = entry_point (grub_efi_image_handle,
-+                            grub_efi_system_table);
++  efi_status = efi_call_2 (entry_point, grub_efi_image_handle,
++			   grub_efi_system_table);
 +
 +  grub_dprintf ("chain", "entry_point returned %ld\n", efi_status);
 +  grub_memcpy (li, &li_bak, sizeof (grub_efi_loaded_image_t));
-+  efi_status = b->free_pool (buffer);
++  efi_status = efi_call_1 (b->free_pool, buffer);
 +
 +  return 1;
 +
 +error_exit:
 +  grub_dprintf ("chain", "error_exit: grub_errno: %d\n", grub_errno);
 +  if (buffer)
-+    b->free_pool (buffer);
++      efi_call_1 (b->free_pool, buffer);
 +
 +  return 0;
 +}
@@ -865,7 +880,7 @@ index 2036924504b..e4ac39c87b4 100644
 +  grub_efi_boot_services_t *b;
 +
 +  b = grub_efi_system_table->boot_services;
-+  b->free_pages (address, pages);
++  efi_call_2 (b->free_pages, address, pages);
 +  grub_free (file_path);
 +  grub_free (cmdline);
 +  cmdline = 0;
@@ -885,8 +900,8 @@ index 2036924504b..e4ac39c87b4 100644
 +
 +  b = grub_efi_system_table->boot_services;
 +
-+  status = b->load_image (0, grub_efi_image_handle, file_path,
-+                          boot_image, fsize, &image_handle);
++  status = efi_call_6 (b->load_image, 0, grub_efi_image_handle, file_path,
++		       boot_image, fsize, &image_handle);
 +  if (status != GRUB_EFI_SUCCESS)
 +    {
 +      if (status == GRUB_EFI_OUT_OF_RESOURCES)
@@ -939,28 +954,20 @@ index 2036924504b..e4ac39c87b4 100644
    grub_efi_status_t status;
    grub_efi_boot_services_t *b;
    grub_device_t dev = 0;
--  grub_efi_device_path_t *dp = NULL, *file_path = NULL;
+   grub_efi_device_path_t *dp = 0;
 -  grub_efi_loaded_image_t *loaded_image;
-+  grub_efi_device_path_t *dp = NULL;
    char *filename;
    void *boot_image = 0;
 -  grub_efi_handle_t dev_handle = 0;
--  grub_efi_physical_address_t address = 0;
--  grub_efi_uintn_t pages = 0;
--  grub_efi_char16_t *cmdline = NULL;
--  grub_efi_handle_t image_handle = NULL;
 +  int rc;
-+
-+  file_path = NULL;
-+  address = 0;
-+  pages = 0;
-+  cmdline = NULL;
-+  image_handle = NULL;
-+  dev_handle = 0;
  
    if (argc == 0)
      return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-@@ -236,12 +927,42 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -222,15 +899,45 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+   address = 0;
+   image_handle = 0;
+   file_path = 0;
++  dev_handle = 0;
  
    b = grub_efi_system_table->boot_services;
  
@@ -989,7 +996,6 @@ index 2036924504b..e4ac39c87b4 100644
 +        }
 +      *(--p16) = 0;
 +    }
-+
 +
    file = grub_file_open (filename, GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE);
    if (! file)
@@ -1002,18 +1008,16 @@ index 2036924504b..e4ac39c87b4 100644
 +  dev = grub_device_open (devname);
 +  if (devname)
 +    grub_free (devname);
-   if (dev == NULL)
-     ;
-   else if (dev->disk)
-@@ -272,19 +993,16 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
-       file_path = make_file_path (dp, filename);
-       if (file_path == NULL)
- 	goto fail;
--
--      grub_printf ("file path: ");
--      grub_efi_print_device_path (file_path);
-     }
+   if (! dev)
+     goto fail;
  
+@@ -267,17 +974,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+   if (! file_path)
+     goto fail;
+ 
+-  grub_printf ("file path: ");
+-  grub_efi_print_device_path (file_path);
+-
 -  size = grub_file_size (file);
 -  if (!size)
 +  fsize = grub_file_size (file);
@@ -1023,12 +1027,12 @@ index 2036924504b..e4ac39c87b4 100644
  		  filename);
        goto fail;
      }
--  pages = (grub_efi_uintn_t) GRUB_EFI_BYTES_TO_PAGES (size);
-+  pages = (grub_efi_uintn_t) GRUB_EFI_BYTES_TO_PAGES (fsize);
+-  pages = (((grub_efi_uintn_t) size + ((1 << 12) - 1)) >> 12);
++  pages = (((grub_efi_uintn_t) fsize + ((1 << 12) - 1)) >> 12);
  
-   status = b->allocate_pages (GRUB_EFI_ALLOCATE_ANY_PAGES,
+   status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_ANY_PAGES,
  			      GRUB_EFI_LOADER_CODE,
-@@ -298,7 +1016,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -291,7 +995,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
      }
  
    boot_image = (void *) ((grub_addr_t) address);
@@ -1037,7 +1041,7 @@ index 2036924504b..e4ac39c87b4 100644
      {
        if (grub_errno == GRUB_ERR_NONE)
  	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
-@@ -308,7 +1026,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -301,7 +1005,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
      }
  
  #if defined (__i386__) || defined (__x86_64__)
@@ -1046,12 +1050,12 @@ index 2036924504b..e4ac39c87b4 100644
      {
        struct grub_macho_fat_header *head = boot_image;
        if (head->magic
-@@ -317,6 +1035,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -310,6 +1014,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_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
++	  if (grub_efi_secure_boot())
 +	    {
 +	      grub_error (GRUB_ERR_BAD_OS,
 +			  "MACHO binaries are forbidden with Secure Boot");
@@ -1061,7 +1065,7 @@ index 2036924504b..e4ac39c87b4 100644
  	  for (i = 0; i < grub_cpu_to_le32 (head->nfat_arch); i++)
  	    {
  	      if (GRUB_MACHO_CPUTYPE_IS_HOST_CURRENT (archs[i].cputype))
-@@ -331,83 +1057,39 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -324,79 +1036,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)
@@ -1079,9 +1083,9 @@ index 2036924504b..e4ac39c87b4 100644
      }
  #endif
  
--  status = b->load_image (0, grub_efi_image_handle, file_path,
--			  boot_image, size,
--			  &image_handle);
+-  status = efi_call_6 (b->load_image, 0, grub_efi_image_handle, file_path,
+-		       boot_image, size,
+-		       &image_handle);
 -  if (status != GRUB_EFI_SUCCESS)
 +  rc = grub_linuxefi_secure_validate((void *)(unsigned long)address, fsize);
 +  grub_dprintf ("chain", "linuxefi_secure_validate: %d\n", rc);
@@ -1112,7 +1116,6 @@ index 2036924504b..e4ac39c87b4 100644
 -    }
 -  loaded_image->device_handle = dev_handle;
 -
--  /* Build load options with arguments from chainloader command line. */
 -  if (argc > 1)
 -    {
 -      int i, len;
@@ -1128,7 +1131,7 @@ index 2036924504b..e4ac39c87b4 100644
 +      grub_load_and_start_image(boot_image);
 +      grub_file_close (file);
 +      grub_device_close (dev);
-+      grub_loader_set_ex (grub_chainloader_boot, grub_chainloader_unload, image_handle, 0);
++      grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0);
  
 -      for (i = 1; i < argc; i++)
 -        {
@@ -1150,33 +1153,30 @@ index 2036924504b..e4ac39c87b4 100644
 -  grub_file_close (file);
 -  grub_device_close (dev);
 -
--  /* We're finished with the source image buffer and file path now. */
--  b->free_pages (address, pages);
--  grub_free (file_path);
--
--  grub_loader_set_ex (grub_chainloader_boot, grub_chainloader_unload, image_handle, 0);
+-  grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0);
 -  return 0;
 -
 - fail:
+-
 +fail:
- 
    if (dev)
      grub_device_close (dev);
-@@ -421,6 +1103,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+ 
+@@ -408,6 +1080,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    if (address)
-     grub_efi_free_pages (address, pages);
+     efi_call_2 (b->free_pages, address, pages);
  
 +  if (cmdline)
 +    grub_free (cmdline);
 +
-   if (image_handle != NULL)
-     b->unload_image (image_handle);
+   grub_dl_unref (my_mod);
  
+   return grub_errno;
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index 925394d1767..0a7f8208022 100644
+index c24202a5dd1..c8ecce6dfd0 100644
 --- a/grub-core/loader/efi/linux.c
 +++ b/grub-core/loader/efi/linux.c
-@@ -98,21 +98,36 @@ struct grub_efi_shim_lock
+@@ -33,21 +33,34 @@ struct grub_efi_shim_lock
  };
  typedef struct grub_efi_shim_lock grub_efi_shim_lock_t;
  
@@ -1184,12 +1184,12 @@ index 925394d1767..0a7f8208022 100644
 +int
  grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
  {
-   grub_guid_t guid = SHIM_LOCK_GUID;
+   grub_efi_guid_t guid = SHIM_LOCK_GUID;
    grub_efi_shim_lock_t *shim_lock;
 +  grub_efi_status_t status;
  
    shim_lock = grub_efi_locate_protocol(&guid, NULL);
- 
+-
 +  grub_dprintf ("secureboot", "shim_lock: %p\n", shim_lock);
    if (!shim_lock)
 -    return 1;
@@ -1208,18 +1208,17 @@ index 925394d1767..0a7f8208022 100644
 +      grub_dprintf ("secureboot", "Kernel signature verification passed\n");
 +      return 1;
 +    }
-+
+ 
+-  return 0;
 +  grub_dprintf ("secureboot", "Kernel signature verification failed (0x%lx)\n",
 +		(unsigned long) status);
 +
 +  return -1;
- 
--  return 0;
  }
  
  #pragma GCC diagnostic push
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 9bfb4ab9e3e..b59d125286d 100644
+index bb2616a8092..6b24cbb9483 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -117,6 +117,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -1245,7 +1244,7 @@ index 9bfb4ab9e3e..b59d125286d 100644
      {
 -      grub_error (GRUB_ERR_FILE_READ_ERROR, N_("Can't read kernel %s"), argv[0]);
 +      grub_error (GRUB_ERR_FILE_READ_ERROR, N_("Can't read kernel %s"),
-+                  argv[0]);
++		  argv[0]);
        goto fail;
      }
  
@@ -1254,7 +1253,7 @@ index 9bfb4ab9e3e..b59d125286d 100644
 +  if (rc < 0)
      {
        grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"),
-                   argv[0]);
+ 		  argv[0]);
 @@ -203,6 +208,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
@@ -1269,7 +1268,7 @@ index 9bfb4ab9e3e..b59d125286d 100644
      }
  
 +  grub_dprintf ("linux", "linux_cmdline = %lx\n",
-+                (unsigned long)linux_cmdline);
++		(unsigned long)linux_cmdline);
 +
    grub_memcpy (linux_cmdline, LINUX_IMAGE, sizeof (LINUX_IMAGE));
    grub_create_loader_cmdline (argc, argv,
@@ -1279,7 +1278,7 @@ index 9bfb4ab9e3e..b59d125286d 100644
  
    params->type_of_loader = 0x21;
 +  grub_dprintf("linux", "kernel_mem: %p handover_offset: %08x\n",
-+               kernel_mem, handover_offset);
++	       kernel_mem, handover_offset);
  
   fail:
 -
@@ -1287,7 +1286,7 @@ index 9bfb4ab9e3e..b59d125286d 100644
      grub_file_close (file);
  
 diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
-index d224daafa4f..b2cfd8c1f44 100644
+index d9ede36773b..0033d9305a9 100644
 --- a/include/grub/efi/linux.h
 +++ b/include/grub/efi/linux.h
 @@ -22,7 +22,7 @@
@@ -1300,10 +1299,10 @@ index d224daafa4f..b2cfd8c1f44 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 9887e14b278..a39743396dc 100644
+index 0ed8781f037..a43adf27464 100644
 --- a/include/grub/efi/pe32.h
 +++ b/include/grub/efi/pe32.h
-@@ -238,7 +238,11 @@ struct grub_pe64_optional_header
+@@ -223,7 +223,11 @@ struct grub_pe64_optional_header
  struct grub_pe32_section_table
  {
    char name[8];
@@ -1316,7 +1315,7 @@ index 9887e14b278..a39743396dc 100644
    grub_uint32_t virtual_address;
    grub_uint32_t raw_data_size;
    grub_uint32_t raw_data_offset;
-@@ -249,12 +253,18 @@ struct grub_pe32_section_table
+@@ -234,12 +238,18 @@ struct grub_pe32_section_table
    grub_uint32_t characteristics;
  };
  
@@ -1339,7 +1338,7 @@ index 9887e14b278..a39743396dc 100644
  
  #define GRUB_PE32_SCN_ALIGN_1BYTES		0x00100000
  #define GRUB_PE32_SCN_ALIGN_2BYTES		0x00200000
-@@ -263,10 +273,26 @@ 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
@@ -1362,11 +1361,13 @@ index 9887e14b278..a39743396dc 100644
 +#define GRUB_PE32_SCN_MEM_EXECUTE		0x20000000
 +#define GRUB_PE32_SCN_MEM_READ			0x40000000
 +#define GRUB_PE32_SCN_MEM_WRITE			0x80000000
++
++
 +
  #define GRUB_PE32_SIGNATURE_SIZE 4
  
- #if GRUB_TARGET_SIZEOF_VOID_P == 8
-@@ -292,6 +318,21 @@ struct grub_pe_image_header
+ struct grub_pe32_header
+@@ -274,6 +302,20 @@ struct grub_pe32_header
  #endif
  };
  
@@ -1383,7 +1384,6 @@ index 9887e14b278..a39743396dc 100644
 +  struct grub_pe32_coff_header coff_header;
 +  struct grub_pe64_optional_header optional_header;
 +};
-+
 +
  struct grub_pe32_fixup_block
  {

0005-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch

@@ -0,0 +1,516 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 6 Oct 2015 16:09:25 -0400
+Subject: [PATCH] Make any of the loaders that link in efi mode honor secure
+ boot.
+
+And in this case "honor" means "even if somebody does link this in, they
+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/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 +++++
+ 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
+ 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 581d9dfc3b3..eb1088fd654 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -207,6 +207,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 a0c164e54f0..41a7f3f0466 100644
+--- a/grub-core/commands/iorw.c
++++ b/grub-core/commands/iorw.c
+@@ -23,6 +23,7 @@
+ #include <grub/env.h>
+ #include <grub/cpu/io.h>
+ #include <grub/i18n.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)
+ 
+ GRUB_MOD_INIT(memrw)
+ {
++  if (grub_efi_secure_boot())
++    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)
+ 
+ GRUB_MOD_FINI(memrw)
+ {
++  if (grub_efi_secure_boot())
++    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 98769eadb34..088cbe9e2bc 100644
+--- a/grub-core/commands/memrw.c
++++ b/grub-core/commands/memrw.c
+@@ -22,6 +22,7 @@
+ #include <grub/extcmd.h>
+ #include <grub/env.h>
+ #include <grub/i18n.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)
+ 
+ GRUB_MOD_INIT(memrw)
+ {
++  if (grub_efi_secure_boot())
++    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)
+ 
+ GRUB_MOD_FINI(memrw)
+ {
++  if (grub_efi_secure_boot())
++    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 896bebfd57e..d7718d26abc 100644
+--- a/grub-core/kern/dl.c
++++ b/grub-core/kern/dl.c
+@@ -32,6 +32,7 @@
+ #include <grub/env.h>
+ #include <grub/cache.h>
+ #include <grub/i18n.h>
++#include <grub/efi/sb.h>
+ 
+ /* Platforms where modules are in a readonly area of memory.  */
+ #if defined(GRUB_MACHINE_QEMU)
+diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
+index 3487b0623a4..6e1ceb90516 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;
+ }
+ 
+-grub_efi_boolean_t
+-grub_efi_secure_boot (void)
+-{
+-  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;
+-}
+-
+ #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 00000000000..d74778b0cac
+--- /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 74888c463ba..69c2a10d351 100644
+--- a/grub-core/loader/efi/appleloader.c
++++ b/grub-core/loader/efi/appleloader.c
+@@ -24,6 +24,7 @@
+ #include <grub/misc.h>
+ #include <grub/efi/api.h>
+ #include <grub/efi/efi.h>
++#include <grub/efi/sb.h>
+ #include <grub/command.h>
+ #include <grub/i18n.h>
+ 
+@@ -227,6 +228,9 @@ static grub_command_t cmd;
+ 
+ GRUB_MOD_INIT(appleloader)
+ {
++  if (grub_efi_secure_boot())
++    return;
++
+   cmd = grub_register_command ("appleloader", grub_cmd_appleloader,
+ 			       N_("[OPTS]"),
+ 			       /* TRANSLATORS: This command is used on EFI to
+@@ -238,5 +242,8 @@ GRUB_MOD_INIT(appleloader)
+ 
+ GRUB_MOD_FINI(appleloader)
+ {
++  if (grub_efi_secure_boot())
++    return;
++
+   grub_unregister_command (cmd);
+ }
+diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
+index ef87b06cf70..5aa3a5dc7dd 100644
+--- a/grub-core/loader/efi/chainloader.c
++++ b/grub-core/loader/efi/chainloader.c
+@@ -34,6 +34,7 @@
+ #include <grub/efi/disk.h>
+ #include <grub/efi/pe32.h>
+ #include <grub/efi/linux.h>
++#include <grub/efi/sb.h>
+ #include <grub/command.h>
+ #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 3730ed38247..5b9b92d6ba5 100644
+--- a/grub-core/loader/i386/bsd.c
++++ b/grub-core/loader/i386/bsd.c
+@@ -39,6 +39,7 @@
+ #ifdef GRUB_MACHINE_PCBIOS
+ #include <grub/machine/int.h>
+ #endif
++#include <grub/efi/sb.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -2130,6 +2131,9 @@ static grub_command_t cmd_netbsd_module_elf, cmd_openbsd_ramdisk;
+ 
+ GRUB_MOD_INIT (bsd)
+ {
++  if (grub_efi_secure_boot())
++    return;
++
+   /* Net and OpenBSD kernels are often compressed.  */
+   grub_dl_load ("gzio");
+ 
+@@ -2169,6 +2173,9 @@ GRUB_MOD_INIT (bsd)
+ 
+ GRUB_MOD_FINI (bsd)
+ {
++  if (grub_efi_secure_boot())
++    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 b255c950526..376c726928a 100644
+--- a/grub-core/loader/i386/linux.c
++++ b/grub-core/loader/i386/linux.c
+@@ -36,6 +36,7 @@
+ #include <grub/lib/cmdline.h>
+ #include <grub/linux.h>
+ #include <grub/machine/kernel.h>
++#include <grub/efi/sb.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -1131,6 +1132,9 @@ static grub_command_t cmd_linux, cmd_initrd;
+ 
+ GRUB_MOD_INIT(linux)
+ {
++  if (grub_efi_secure_boot())
++    return;
++
+   cmd_linux = grub_register_command ("linux", grub_cmd_linux,
+ 				     0, N_("Load Linux."));
+   cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
+@@ -1140,6 +1144,9 @@ GRUB_MOD_INIT(linux)
+ 
+ GRUB_MOD_FINI(linux)
+ {
++  if (grub_efi_secure_boot())
++    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 73fb91e0570..fe3e1d41d09 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>
+ #include <grub/lib/cmdline.h>
+ #include <grub/linux.h>
++#include <grub/efi/sb.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -483,6 +484,9 @@ static grub_command_t cmd_linux, cmd_linux16, cmd_initrd, cmd_initrd16;
+ 
+ GRUB_MOD_INIT(linux16)
+ {
++  if (grub_efi_secure_boot())
++    return;
++
+   cmd_linux =
+     grub_register_command ("linux", grub_cmd_linux,
+ 			   0, N_("Load Linux."));
+@@ -500,6 +504,9 @@ GRUB_MOD_INIT(linux16)
+ 
+ GRUB_MOD_FINI(linux16)
+ {
++  if (grub_efi_secure_boot())
++    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 4a98d708259..3e6ad166dc9 100644
+--- a/grub-core/loader/multiboot.c
++++ b/grub-core/loader/multiboot.c
+@@ -50,6 +50,7 @@
+ #include <grub/video.h>
+ #include <grub/memory.h>
+ #include <grub/i18n.h>
++#include <grub/efi/sb.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -444,6 +445,9 @@ static grub_command_t cmd_multiboot, cmd_module;
+ 
+ GRUB_MOD_INIT(multiboot)
+ {
++  if (grub_efi_secure_boot())
++    return;
++
+   cmd_multiboot =
+ #ifdef GRUB_USE_MULTIBOOT2
+     grub_register_command ("multiboot2", grub_cmd_multiboot,
+@@ -464,6 +468,9 @@ GRUB_MOD_INIT(multiboot)
+ 
+ GRUB_MOD_FINI(multiboot)
+ {
++  if (grub_efi_secure_boot())
++    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 7f74d1d6fc9..e0f47e72b06 100644
+--- a/grub-core/loader/xnu.c
++++ b/grub-core/loader/xnu.c
+@@ -34,6 +34,7 @@
+ #include <grub/env.h>
+ #include <grub/i18n.h>
+ #include <grub/verify.h>
++#include <grub/efi/sb.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -1478,6 +1479,9 @@ static grub_extcmd_t cmd_splash;
+ 
+ GRUB_MOD_INIT(xnu)
+ {
++  if (grub_efi_secure_boot())
++    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,
+@@ -1518,6 +1522,9 @@ GRUB_MOD_INIT(xnu)
+ 
+ GRUB_MOD_FINI(xnu)
+ {
++  if (grub_efi_secure_boot())
++    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 6840bfee9b7..090c8621066 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,
+ 				     const grub_efi_guid_t *guid,
+ 				     void *data,
+ 				     grub_size_t datasize);
+-grub_efi_boolean_t EXPORT_FUNC (grub_efi_secure_boot) (void);
+ 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 00000000000..9629fbb0f9e
+--- /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 00000000000..e69de29bb2d
+diff --git a/include/grub/mips/linux.h b/include/grub/mips/linux.h
+new file mode 100644
+index 00000000000..e69de29bb2d
+diff --git a/include/grub/powerpc/linux.h b/include/grub/powerpc/linux.h
+new file mode 100644
+index 00000000000..e69de29bb2d
+diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h
+new file mode 100644
+index 00000000000..e69de29bb2d
+diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
+index 3ea8e7ff45f..c6ba5b2d763 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

0006-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch

@@ -7,40 +7,40 @@ Allow booting 64-bit kernels on 32-bit EFI on x86.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- grub-core/loader/efi/linux.c      |   9 ++-
- grub-core/loader/i386/efi/linux.c | 116 ++++++++++++++++++++++++++------------
- include/grub/i386/linux.h         |   5 ++
- 3 files changed, 91 insertions(+), 39 deletions(-)
+ grub-core/loader/efi/linux.c      |   9 +++-
+ grub-core/loader/i386/efi/linux.c | 110 ++++++++++++++++++++++++++------------
+ include/grub/i386/linux.h         |   7 ++-
+ 3 files changed, 89 insertions(+), 37 deletions(-)
 
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index 0a7f8208022..742e8e9af35 100644
+index c8ecce6dfd0..0622dfa48d4 100644
 --- a/grub-core/loader/efi/linux.c
 +++ b/grub-core/loader/efi/linux.c
-@@ -136,12 +136,17 @@ grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
+@@ -69,12 +69,17 @@ grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
  typedef void (*handover_func) (void *, grub_efi_system_table_t *, void *);
  
  grub_err_t
--grub_efi_linux_boot (void *kernel_address, grub_off_t offset,
-+grub_efi_linux_boot (void *kernel_address, grub_off_t handover_offset,
+-grub_efi_linux_boot (void *kernel_addr, grub_off_t offset,
++grub_efi_linux_boot (void *kernel_addr, grub_off_t handover_offset,
  		     void *kernel_params)
  {
    handover_func hf;
 +  int offset = 0;
  
--  hf = (handover_func)((char *)kernel_address + offset);
+-  hf = (handover_func)((char *)kernel_addr + offset);
 +#ifdef __x86_64__
 +  offset = 512;
 +#endif
 +
-+  hf = (handover_func)((char *)kernel_address + handover_offset + offset);
++  hf = (handover_func)((char *)kernel_addr + handover_offset + offset);
    hf (grub_efi_image_handle, grub_efi_system_table, kernel_params);
  
    return GRUB_ERR_BUG;
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index b59d125286d..3c2e30f8751 100644
+index 6b24cbb9483..3017d0f3e52 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
-@@ -44,15 +44,11 @@ static char *linux_cmdline;
+@@ -44,14 +44,10 @@ static char *linux_cmdline;
  static grub_err_t
  grub_linuxefi_boot (void)
  {
@@ -52,13 +52,11 @@ index b59d125286d..3c2e30f8751 100644
    asm volatile ("cli");
  
 -  return grub_efi_linux_boot ((char *)kernel_mem, handover_offset + offset,
--                              params);
 +  return grub_efi_linux_boot ((char *)kernel_mem,
 +			      handover_offset,
-+			      params);
+ 			      params);
  }
  
- static grub_err_t
 @@ -153,14 +149,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
    return grub_errno;
  }
@@ -70,7 +68,7 @@ index b59d125286d..3c2e30f8751 100644
 +
  static grub_err_t
  grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-                 int argc, char *argv[])
+ 		int argc, char *argv[])
  {
    grub_file_t file = 0;
 -  struct linux_i386_kernel_header lh;
@@ -168,7 +166,7 @@ index b59d125286d..3c2e30f8751 100644
 +
    grub_dprintf ("linux", "setting up cmdline\n");
    linux_cmdline = grub_efi_allocate_pages_max(0x3fffffff,
--                                         BYTES_TO_PAGES(lh.cmdline_size + 1));
+-					 BYTES_TO_PAGES(lh.cmdline_size + 1));
 -
 +					 BYTES_TO_PAGES(lh->cmdline_size + 1));
    if (!linux_cmdline)
@@ -178,10 +176,9 @@ index b59d125286d..3c2e30f8751 100644
    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),
--                              GRUB_VERIFY_KERNEL_CMDLINE);
+-			      lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1),
 +			      lh->cmdline_size - (sizeof (LINUX_IMAGE) - 1),
-+			      GRUB_VERIFY_KERNEL_CMDLINE);
+ 			      GRUB_VERIFY_KERNEL_CMDLINE);
  
 -  lh.cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
 +  grub_dprintf ("linux", "cmdline:%s\n", linux_cmdline);
@@ -197,13 +194,13 @@ index b59d125286d..3c2e30f8751 100644
 +  start = (lh->setup_sects + 1) * 512;
  
 -  kernel_mem = grub_efi_allocate_pages_max(lh.pref_address,
--                                           BYTES_TO_PAGES(lh.init_size));
+-					   BYTES_TO_PAGES(lh.init_size));
 +  kernel_mem = grub_efi_allocate_pages_max(lh->pref_address,
 +					   BYTES_TO_PAGES(lh->init_size));
  
    if (!kernel_mem)
      kernel_mem = grub_efi_allocate_pages_max(0x3fffffff,
--                                             BYTES_TO_PAGES(lh.init_size));
+-					     BYTES_TO_PAGES(lh.init_size));
 +					     BYTES_TO_PAGES(lh->init_size));
  
    if (!kernel_mem)
@@ -232,7 +229,7 @@ index b59d125286d..3c2e30f8751 100644
 +  params->ext_loader_type = 0;
 +  params->ext_loader_ver = 2;
    grub_dprintf("linux", "kernel_mem: %p handover_offset: %08x\n",
-                kernel_mem, handover_offset);
+ 	       kernel_mem, handover_offset);
  
 @@ -301,10 +343,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        loaded = 0;
@@ -241,26 +238,27 @@ index b59d125286d..3c2e30f8751 100644
 -  if (linux_cmdline && !loaded)
 +  if (linux_cmdline && lh && !loaded)
      grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)
--                         linux_cmdline,
--                         BYTES_TO_PAGES(lh.cmdline_size + 1));
-+			 linux_cmdline,
+ 			 linux_cmdline,
+-			 BYTES_TO_PAGES(lh.cmdline_size + 1));
 +			 BYTES_TO_PAGES(lh->cmdline_size + 1));
  
    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 d4b55086953..4ccd9d7d9f2 100644
+index ce30e7fb01b..a093679cb80 100644
 --- a/include/grub/i386/linux.h
 +++ b/include/grub/i386/linux.h
-@@ -148,6 +148,11 @@ struct linux_i386_kernel_header
+@@ -136,7 +136,12 @@ struct linux_i386_kernel_header
    grub_uint32_t kernel_alignment;
    grub_uint8_t relocatable;
    grub_uint8_t min_alignment;
+-  grub_uint8_t pad[2];
 +#define LINUX_XLF_KERNEL_64                   (1<<0)
 +#define LINUX_XLF_CAN_BE_LOADED_ABOVE_4G      (1<<1)
 +#define LINUX_XLF_EFI_HANDOVER_32             (1<<2)
 +#define LINUX_XLF_EFI_HANDOVER_64             (1<<3)
 +#define LINUX_XLF_EFI_KEXEC                   (1<<4)
-   grub_uint16_t xloadflags;
++  grub_uint16_t xloadflags;
    grub_uint32_t cmdline_size;
    grub_uint32_t hardware_subarch;
+   grub_uint64_t hardware_subarch_data;

0007-re-write-.gitignore.patch

@@ -4,14 +4,14 @@ Date: Mon, 8 Jul 2019 12:55:29 +0200
 Subject: [PATCH] re-write .gitignore
 
 ---
- .gitignore                        | 150 ++++++++++++++++++++++++++++++++++++++
- docs/.gitignore                   |   5 ++
- grub-core/.gitignore              |  16 ++++
+ .gitignore                        | 366 +++++++++++++++-----------------------
+ docs/.gitignore                   |   5 +
+ grub-core/.gitignore              |  16 ++
  grub-core/lib/.gitignore          |   1 +
  include/grub/gcrypt/.gitignore    |   2 +
- po/.gitignore                     |   5 ++
+ po/.gitignore                     |   5 +
  util/bash-completion.d/.gitignore |   2 +
- 7 files changed, 181 insertions(+)
+ 7 files changed, 171 insertions(+), 226 deletions(-)
  create mode 100644 docs/.gitignore
  create mode 100644 grub-core/.gitignore
  create mode 100644 grub-core/lib/.gitignore
@@ -20,14 +20,10 @@ Subject: [PATCH] re-write .gitignore
  create mode 100644 util/bash-completion.d/.gitignore
 
 diff --git a/.gitignore b/.gitignore
-index 4d0dfb700e4..a18787dcfe6 100644
+index 819cd185d44..b45a633f3d1 100644
 --- a/.gitignore
 +++ b/.gitignore
-@@ -279,3 +279,153 @@ widthspec.bin
- /xfs_test
- /xzcompress_test
- /zfs_test
-+=======
+@@ -1,237 +1,151 @@
 +# things ./autogen.sh will create
 +/Makefile.utilgcry.def
 +/ABOUT-NLS
@@ -40,7 +36,45 @@ index 4d0dfb700e4..a18787dcfe6 100644
 +/Makefile
 +
 +# things very common editors create that we never want
-+*~
+ *~
+-00_header
+-10_*
+-20_linux_xen
+-30_os-prober
+-40_custom
+-41_custom
+-*.1
+-*.8
+-ABOUT-NLS
+-aclocal.m4
+-ahci_test
+-ascii.bitmaps
+-ascii.h
+-autom4te.cache
+-build-aux
+-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
 +.*.sw?
 +*.patch
 +
@@ -53,22 +87,207 @@ index 4d0dfb700e4..a18787dcfe6 100644
 +*.a
 +*.am
 +*.efi
-+*.exec
-+*.image
+ *.exec
+-*.exec.exe
+-fddboot_test
+-genkernsyms.sh
+-gensymlist.sh
+-gentrigtables
+-gentrigtables.exe
+-gettext_strings_test
+-/gnulib
+-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.grub
+-install-sh
+-lib/libgcrypt-grub
+-libgrub_a_init.c
+-*.log
 +*.img
 +*.info
-+*.lst
-+*.marker
-+/m4
-+*.mod
+ *.lst
+-lzocompress_test
+ *.marker
+-Makefile
+ /m4
+ *.mod
+-mod-*.c
+-missing
+-netboot_test
 +*.module
-+*.o
-+*.pf2
+ *.o
+-*.a
+-ohci_test
+-partmap_test
+-pata_test
+ *.pf2
+-*.pp
+-po/*.mo
+-po/grub.pot
+-po/Makefile.in.in
+-po/Makevars
+-po/Makevars.template
+-po/POTFILES
+-po/Rules-quot
+-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
+ .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/lib/gnulib
+-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
 +
 +# next are things you get if you do ./configure in the topdir (for e.g.
 +# "make dist" invocation.
@@ -101,7 +320,10 @@ index 4d0dfb700e4..a18787dcfe6 100644
 +/build-grub-gen-widthspec
 +/build-grub-mkfont
 +/config-util.h.in
-+/garbage-gen
+ /garbage-gen
+-/garbage-gen.exe
+-/grub-fs-tester
+-grub-core/build-grub-module-verifier
 +/grub*-bios-setup
 +/grub*-bios-setup.8
 +/grub*-editenv
@@ -152,6 +374,8 @@ index 4d0dfb700e4..a18787dcfe6 100644
 +/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

0008-IBM-client-architecture-CAS-reboot-support.patch

@@ -7,20 +7,16 @@ This is an implementation of IBM client architecture (CAS) reboot for GRUB.
 
 There are cases where the POWER firmware must reboot in order to support
 specific features requested by a kernel. The kernel calls
-ibm,client-architecture-support and it may either return or reboot with
-the new feature set. eg:
+ibm,client-architecture-support and it may either return or reboot with the new
+feature set. eg:
 
 Calling ibm,client-architecture-support.../
 Elapsed time since release of system processors: 70959 mins 50 secs
 Welcome to GRUB!
 
-Instead of return to the GRUB menu, it will check if the flag for CAS
-reboot is set. If so, grub will automatically boot the last booted
-kernel using the same parameters
-
-Signed-off-by: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
-[rharwood@redhat.com: commit message rewrap]
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+Instead of return to the GRUB menu, it will check if the flag for CAS reboot is
+set. If so, grub will automatically boot the last booted kernel using the same
+parameters
 ---
  grub-core/kern/ieee1275/openfw.c | 63 ++++++++++++++++++++++++++++++++++++++++
  grub-core/normal/main.c          | 19 ++++++++++++
@@ -29,7 +25,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  4 files changed, 91 insertions(+)
 
 diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
-index 11b2beb2ff2..e2ecc65d2d8 100644
+index 4d493ab7661..3a6689abb11 100644
 --- a/grub-core/kern/ieee1275/openfw.c
 +++ b/grub-core/kern/ieee1275/openfw.c
 @@ -591,3 +591,66 @@ grub_ieee1275_get_boot_dev (void)
@@ -100,10 +96,10 @@ index 11b2beb2ff2..e2ecc65d2d8 100644
 +  return 0;
 +}
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index bd44310005d..d3f53d93d87 100644
+index 1b03dfd57b9..222e239c1be 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -34,6 +34,9 @@
+@@ -33,6 +33,9 @@
  #include <grub/charset.h>
  #include <grub/script_sh.h>
  #include <grub/bufio.h>
@@ -113,7 +109,7 @@ index bd44310005d..d3f53d93d87 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -276,6 +279,22 @@ grub_normal_execute (const char *config, int nested, int batch)
+@@ -275,6 +278,22 @@ grub_normal_execute (const char *config, int nested, int batch)
      {
        menu = read_config_file (config);
  
@@ -137,7 +133,7 @@ index bd44310005d..d3f53d93d87 100644
        grub_errno = GRUB_ERR_NONE;
      }
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index 14ff09094f0..dab8fd2aeb0 100644
+index ee299fd0ea6..0d05d6b0709 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
 @@ -28,6 +28,9 @@
@@ -150,7 +146,7 @@ index 14ff09094f0..dab8fd2aeb0 100644
  
  /* 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.  */
-@@ -883,6 +886,10 @@ grub_script_execute_sourcecode (const char *source)
+@@ -878,6 +881,10 @@ grub_script_execute_sourcecode (const char *source)
    grub_err_t ret = 0;
    struct grub_script *parsed_script;
  
@@ -162,10 +158,10 @@ index 14ff09094f0..dab8fd2aeb0 100644
      {
        char *line;
 diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index dddb385149e..4f6e6aaa098 100644
+index 73e2f464475..0a599607f31 100644
 --- a/include/grub/ieee1275/ieee1275.h
 +++ b/include/grub/ieee1275/ieee1275.h
-@@ -251,6 +251,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);

0009-for-ppc-reset-console-display-attr-when-clear-screen.patch

@@ -10,14 +10,12 @@ This should fix this bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=908519
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
-Signed-off-by: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/term/terminfo.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
-index 4e534c683eb..3dbe88e8933 100644
+index d317efa368d..29df35e6d20 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,

0010-Disable-GRUB-video-support-for-IBM-power-machines.patch

@@ -5,9 +5,6 @@ Subject: [PATCH] Disable GRUB video support for IBM power machines
 
 Should fix the problem in bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=973205
-
-Signed-off-by: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/kern/ieee1275/cmain.c  | 5 ++++-
  grub-core/video/ieee1275.c       | 9 ++++++---
@@ -15,10 +12,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  3 files changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
-index e74de32483f..810a089a934 100644
+index 20cbbd761ec..04df9d2c667 100644
 --- a/grub-core/kern/ieee1275/cmain.c
 +++ b/grub-core/kern/ieee1275/cmain.c
-@@ -89,7 +89,10 @@ grub_ieee1275_find_options (void)
+@@ -90,7 +90,10 @@ grub_ieee1275_find_options (void)
    }
  
    if (rc >= 0 && grub_strncmp (tmp, "IBM", 3) == 0)
@@ -31,10 +28,10 @@ index e74de32483f..810a089a934 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 ca3d3c3b2c8..5592e4bb7c9 100644
+index 17a3dbbb575..b8e4b3feb32 100644
 --- a/grub-core/video/ieee1275.c
 +++ b/grub-core/video/ieee1275.c
-@@ -351,9 +351,12 @@ static struct grub_video_adapter grub_video_ieee1275_adapter =
+@@ -352,9 +352,12 @@ static struct grub_video_adapter grub_video_ieee1275_adapter =
  
  GRUB_MOD_INIT(ieee1275_fb)
  {
@@ -51,14 +48,14 @@ index ca3d3c3b2c8..5592e4bb7c9 100644
  
  GRUB_MOD_FINI(ieee1275_fb)
 diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index 4f6e6aaa098..db0ec5f4c68 100644
+index 0a599607f31..b5a1d49bbc3 100644
 --- a/include/grub/ieee1275/ieee1275.h
 +++ b/include/grub/ieee1275/ieee1275.h
-@@ -145,6 +145,8 @@ enum grub_ieee1275_flag
-   GRUB_IEEE1275_FLAG_POWER_VM,
+@@ -148,6 +148,8 @@ enum grub_ieee1275_flag
+   GRUB_IEEE1275_FLAG_CURSORONOFF_ANSI_BROKEN,
  
-   GRUB_IEEE1275_FLAG_POWER_KVM,
-+
+   GRUB_IEEE1275_FLAG_RAW_DEVNAMES,
++  
 +  GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT
  };
  

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

@@ -0,0 +1,26 @@
+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 9f477ff0546..523d4e029bb 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
+ 

0012-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 cd667a2eb75..ae3a49321ad 100644
+index 7656f2434e5..d283af64c8c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -319,6 +319,14 @@ AC_SUBST(grubdirname)
+@@ -305,6 +305,14 @@ AC_SUBST(grubdirname)
  AC_DEFINE_UNQUOTED(GRUB_DIR_NAME, "$grubdirname",
      [Default grub directory name])
  
@@ -28,7 +28,7 @@ index cd667a2eb75..ae3a49321ad 100644
  #
  # Checks for build programs.
  #
-@@ -534,6 +542,9 @@ HOST_CFLAGS="$HOST_CFLAGS $grub_cv_cc_w_extra_flags"
+@@ -516,6 +524,9 @@ HOST_CFLAGS="$HOST_CFLAGS $grub_cv_cc_w_extra_flags"
  # Check for target programs.
  #
  

0014-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 6a90e091f22..6444ee6f969 100644
+index d5e0c79a70e..9175ad297d8 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
-@@ -163,15 +163,40 @@ grub_menu_set_timeout (int timeout)
+@@ -163,16 +163,41 @@ grub_menu_set_timeout (int timeout)
      }
  }
  
@@ -51,13 +51,14 @@ index 6a90e091f22..6444ee6f969 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, *tail;
+   const char *val;
+   char *tail;
    int entry;
 +  int sz = 0;
  
    val = grub_env_get (name);
    if (! val)
-@@ -181,9 +206,39 @@ get_and_remove_first_entry_number (const char *name)
+@@ -182,9 +207,39 @@ get_and_remove_first_entry_number (const char *name)
  
    entry = (int) grub_strtoul (val, &tail, 0);
  
@@ -98,7 +99,7 @@ index 6a90e091f22..6444ee6f969 100644
        while (*tail && grub_isspace (*tail))
  	tail++;
        grub_env_set (name, tail);
-@@ -346,7 +401,7 @@ grub_menu_execute_with_fallback (grub_menu_t menu,
+@@ -347,7 +402,7 @@ grub_menu_execute_with_fallback (grub_menu_t menu,
    grub_menu_execute_entry (entry, 1);
  
    /* Deal with fallback entries.  */
@@ -107,7 +108,7 @@ index 6a90e091f22..6444ee6f969 100644
  	 >= 0)
      {
        grub_print_error ();
-@@ -464,30 +519,6 @@ grub_menu_register_viewer (struct grub_menu_viewer *viewer)
+@@ -465,30 +520,6 @@ grub_menu_register_viewer (struct grub_menu_viewer *viewer)
    viewers = viewer;
  }
  

0015-Add-GRUB_DISABLE_UUID.patch

@@ -0,0 +1,106 @@
+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 87795075a87..6f524305085 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 523d4e029bb..9ecbcfb5b43 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 0f801cab3e4..1001a12232b 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'

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

@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  grub-core/commands/minicmd.c         | 20 ++++++++++++++++----
  grub-core/kern/efi/efi.c             |  9 +++++++--
  grub-core/kern/emu/main.c            |  2 +-
- grub-core/kern/emu/misc.c            |  9 +++++----
+ grub-core/kern/emu/misc.c            |  5 +++--
  grub-core/kern/i386/coreboot/init.c  |  2 +-
  grub-core/kern/i386/qemu/init.c      |  2 +-
  grub-core/kern/ieee1275/init.c       |  2 +-
@@ -24,13 +24,13 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  grub-core/kern/uboot/init.c          |  6 +++---
  grub-core/kern/xen/init.c            |  2 +-
  include/grub/misc.h                  |  2 +-
- 14 files changed, 50 insertions(+), 23 deletions(-)
+ 14 files changed, 48 insertions(+), 21 deletions(-)
 
 diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
-index fa498931ed2..2bd3ac76f2d 100644
+index 6bbce3128cf..6d66b7c453a 100644
 --- a/grub-core/commands/minicmd.c
 +++ b/grub-core/commands/minicmd.c
-@@ -182,12 +182,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
+@@ -179,12 +179,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
  }
  
  /* exit */
@@ -60,10 +60,10 @@ index fa498931ed2..2bd3ac76f2d 100644
  }
  
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index b93ae3aba12..885d7c6420e 100644
+index 6e1ceb90516..370ce03c5d7 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -175,11 +175,16 @@ grub_reboot (void)
+@@ -164,11 +164,16 @@ grub_reboot (void)
  }
  
  void
@@ -76,14 +76,14 @@ index b93ae3aba12..885d7c6420e 100644
 +    rc = GRUB_EFI_SUCCESS;
 +
    grub_machine_fini (GRUB_LOADER_FLAG_NORETURN);
-   grub_efi_system_table->boot_services->exit (grub_efi_image_handle,
--					      GRUB_EFI_SUCCESS, 0, 0);
-+					      rc, 0, 0);
+   efi_call_4 (grub_efi_system_table->boot_services->exit,
+-              grub_efi_image_handle, GRUB_EFI_SUCCESS, 0, 0);
++              grub_efi_image_handle, rc, 0, 0);
    for (;;) ;
  }
  
 diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
-index 855b11c3dec..38c1576a2ef 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,19 +96,10 @@ index 855b11c3dec..38c1576a2ef 100644
    grub_reboot ();
  }
 diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
-index 521220b49d2..16c79bc9488 100644
+index 65db79baa10..19cd007d448 100644
 --- a/grub-core/kern/emu/misc.c
 +++ b/grub-core/kern/emu/misc.c
-@@ -83,7 +83,7 @@ grub_util_error (const char *fmt, ...)
-   vfprintf (stderr, fmt, ap);
-   va_end (ap);
-   fprintf (stderr, ".\n");
--  grub_exit ();
-+  grub_exit (1);
- }
- 
- void *
-@@ -152,12 +152,13 @@ xasprintf (const char *fmt, ...)
+@@ -139,9 +139,10 @@ xasprintf (const char *fmt, ...)
  
  #if !defined (GRUB_MACHINE_EMU) || defined (GRUB_UTIL)
  void
@@ -116,17 +107,13 @@ index 521220b49d2..16c79bc9488 100644
 +__attribute__ ((noreturn))
 +grub_exit (int rc)
  {
--#if defined (GRUB_KERNEL)
-+#if defined (GRUB_KERNEL) && !defined (GRUB_MACHINE_EFI)
-   grub_reboot ();
- #endif
 -  exit (1);
 +  exit (rc < 0 ? 1 : rc);
  }
  #endif
  
 diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c
-index 4fae8b571f1..feaf9295e30 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[];
@@ -139,7 +126,7 @@ index 4fae8b571f1..feaf9295e30 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 08f81d25e68..604fc94b5a0 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[];
@@ -152,11 +139,11 @@ index 08f81d25e68..604fc94b5a0 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 fb7d1a3bacf..50c65b2f6e5 100644
+index d483e35eed2..e71d1584164 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
-@@ -114,7 +114,7 @@ grub_addr_t grub_ieee1275_original_stack;
- #define BYTE22              (DY_MEM_V2 | DRC_INFO)
+@@ -71,7 +71,7 @@ grub_addr_t grub_ieee1275_original_stack;
+ #endif
  
  void
 -grub_exit (void)
@@ -165,7 +152,7 @@ index fb7d1a3bacf..50c65b2f6e5 100644
    grub_ieee1275_exit ();
  }
 diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c
-index 2ed3ff3191e..5c40c34078d 100644
+index 3834a149093..86b3a25ec40 100644
 --- a/grub-core/kern/mips/arc/init.c
 +++ b/grub-core/kern/mips/arc/init.c
 @@ -276,7 +276,7 @@ grub_halt (void)
@@ -178,7 +165,7 @@ index 2ed3ff3191e..5c40c34078d 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 5bd721260f6..97b09b0eeea 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)
@@ -191,7 +178,7 @@ index 5bd721260f6..97b09b0eeea 100644
    grub_halt ();
  }
 diff --git a/grub-core/kern/mips/qemu_mips/init.c b/grub-core/kern/mips/qemu_mips/init.c
-index b5477b87ffa..69488a34e7c 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)))
@@ -204,10 +191,10 @@ index b5477b87ffa..69488a34e7c 100644
    grub_halt ();
  }
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 7cee5d75c3c..11037dc0227 100644
+index 3b633d51f4c..cd63a8cea73 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
-@@ -1311,9 +1311,18 @@ grub_abort (void)
+@@ -1095,9 +1095,18 @@ grub_abort (void)
        grub_getkey ();
      }
  
@@ -266,15 +253,15 @@ index 782ca72952a..708b060f324 100644
    struct sched_shutdown arg;
  
 diff --git a/include/grub/misc.h b/include/grub/misc.h
-index 1b35a167fde..72aff15750d 100644
+index ee48eb7a726..f9135b62e35 100644
 --- a/include/grub/misc.h
 +++ b/include/grub/misc.h
-@@ -385,7 +385,7 @@ char *EXPORT_FUNC(grub_xasprintf) (const char *fmt, ...)
+@@ -334,7 +334,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;
- 
 -void EXPORT_FUNC(grub_exit) (void) __attribute__ ((noreturn));
 +void EXPORT_FUNC(grub_exit) (int rc) __attribute__ ((noreturn));
- void EXPORT_FUNC(grub_abort) (void) __attribute__ ((noreturn));
  grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
  					  grub_uint64_t d,
+ 					  grub_uint64_t *r);

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

@@ -0,0 +1,19 @@
+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 00000000000..33ffaa40460
+--- /dev/null
++++ b/.gitattributes
+@@ -0,0 +1 @@
++po/exclude.pot binary

0018-Make-efi-machines-load-an-env-block-from-a-variable.patch

@@ -6,38 +6,30 @@ 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, 35 insertions(+)
+ grub-core/kern/efi/init.c   | 34 +++++++++++++++++++++++++++++++++-
+ 2 files changed, 34 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 1571421d7e8..0bffbfea917 100644
+index eb1088fd654..41b5e16a3ce 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -219,6 +219,7 @@ kernel = {
+@@ -203,6 +203,7 @@ kernel = {
+   efi = term/efi/console.c;
+   efi = kern/acpi.c;
    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 6c54af6e79e..b5201974a76 100644
+index 3dfdf2d22b0..71d2279a0c1 100644
 --- a/grub-core/kern/efi/init.c
 +++ b/grub-core/kern/efi/init.c
-@@ -28,8 +28,11 @@
+@@ -25,9 +25,40 @@
  #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_char16_t stack_chk_fail_msg[] =
-@@ -103,6 +106,36 @@ stack_protector_init (void)
  
  grub_addr_t grub_modbase;
  
@@ -58,12 +50,12 @@ index 6c54af6e79e..b5201974a76 100644
 +static void
 +grub_efi_env_init (void)
 +{
-+  grub_guid_t efi_grub_guid = GRUB_EFI_GRUB_VARIABLE_GUID;
++  grub_efi_guid_t efi_grub_guid = GRUB_EFI_GRUB_VARIABLE_GUID;
 +  struct grub_envblk envblk_s = { NULL, 0 };
 +  grub_envblk_t envblk = &envblk_s;
 +
-+  grub_efi_get_variable ("GRUB_ENV", &efi_grub_guid, &envblk_s.size,
-+                         (void **) &envblk_s.buf);
++  envblk_s.buf = grub_efi_get_variable ("GRUB_ENV", &efi_grub_guid,
++					&envblk_s.size);
 +  if (!envblk_s.buf || envblk_s.size < 1)
 +    return;
 +
@@ -71,14 +63,19 @@ index 6c54af6e79e..b5201974a76 100644
 +  grub_free (envblk_s.buf);
 +}
 +
- __attribute__ ((__optimize__ ("-fno-stack-protector"))) void
+ void
  grub_efi_init (void)
  {
-@@ -128,6 +161,7 @@ grub_efi_init (void)
- 
-   grub_efi_system_table->boot_services->set_watchdog_timer (0, 0, 0, NULL);
+@@ -42,10 +73,11 @@ grub_efi_init (void)
+   efi_call_4 (grub_efi_system_table->boot_services->set_watchdog_timer,
+ 	      0, 0, 0, NULL);
  
 +  grub_efi_env_init ();
    grub_efidisk_init ();
+ }
+ 
+-void (*grub_efi_net_config) (grub_efi_handle_t hnd, 
++void (*grub_efi_net_config) (grub_efi_handle_t hnd,
+ 			     char **device,
+ 			     char **path);
  
-   grub_efi_register_debug_commands ();

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

@@ -0,0 +1,140 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
+Date: Mon, 8 Jul 2019 14:10:58 +0200
+Subject: [PATCH] DHCP client ID and UUID options added.
+
+---
+ grub-core/net/bootp.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++-----
+ include/grub/net.h    |  2 ++
+ 2 files changed, 79 insertions(+), 8 deletions(-)
+
+diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
+index 04cfbb04504..0e6e41a1699 100644
+--- a/grub-core/net/bootp.c
++++ b/grub-core/net/bootp.c
+@@ -95,6 +95,49 @@ enum
+ /* Max timeout when waiting for BOOTP/DHCP reply */
+ #define GRUB_DHCP_MAX_PACKET_TIMEOUT 32
+ 
++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 const void *
+ find_dhcp_option (const struct grub_net_bootp_packet *bp, grub_size_t size,
+ 		  grub_uint8_t opt_code, grub_uint8_t *opt_len)
+@@ -152,6 +195,9 @@ again:
+       if (i + taglength >= size)
+ 	return NULL;
+ 
++      grub_dprintf("net", "DHCP option %u (0x%02x) found with length %u.\n",
++                   tagtype, tagtype, taglength);
++
+       /* FIXME RFC 3396 options concatentation */
+       if (tagtype == opt_code)
+ 	{
+@@ -354,6 +400,37 @@ grub_net_configure_by_dhcp_ack (const char *name,
+     }
+   grub_net_add_ipv4_local (inter, mask);
+ 
++  opt = find_dhcp_option (bp, size, GRUB_NET_BOOTP_CLIENT_ID, &opt_len);
++  if (opt)
++    {
++      set_env_limn_ro (name, "clientid", (char *) opt, opt_len);
++    }
++
++  opt = find_dhcp_option (bp, size, GRUB_NET_BOOTP_CLIENT_UUID, &opt_len);
++  if (opt && opt_len == 17)
++    {
++      /* The format is 9cfe245e-d0c8-bd45-a79f-54ea5fbd3d97 */
++
++      opt += 1;
++      opt_len -= 1;
++
++      char *val = grub_malloc (2 * opt_len + 4 + 1);
++      int i = 0;
++      int j = 0;
++      for (i = 0; i < opt_len; i++)
++        {
++          val[2 * i + j] = hexdigit (opt[i] >> 4);
++          val[2 * i + 1 + j] = hexdigit (opt[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 * opt_len + 4);
++    }
++
+   /* We do not implement dead gateway detection and the first entry SHOULD
+      be preferred one */
+   opt = find_dhcp_option (bp, size, GRUB_NET_BOOTP_ROUTER, &opt_len);
+@@ -631,14 +708,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 4a9069a1474..556c54e579f 100644
+--- a/include/grub/net.h
++++ b/include/grub/net.h
+@@ -462,6 +462,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_DHCP_REQUESTED_IP_ADDRESS = 50,
+     GRUB_NET_DHCP_OVERLOAD = 52,
+     GRUB_NET_DHCP_MESSAGE_TYPE = 53,

0020-Don-t-say-GNU-Linux-in-generated-menus.patch

@@ -1,85 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Mon, 14 Mar 2011 14:27:42 -0400
-Subject: [PATCH] Don't say "GNU/Linux" in generated menus.
-
-[rharwood: say it even less]
----
- grub-core/normal/main.c         | 2 +-
- tests/util/grub-shell-tester.in | 2 +-
- tests/util/grub-shell.in        | 2 +-
- util/grub.d/10_linux.in         | 4 ++--
- util/grub.d/20_linux_xen.in     | 4 ++--
- 5 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 1317279c081..568c2adfa16 100644
---- a/grub-core/normal/main.c
-+++ b/grub-core/normal/main.c
-@@ -218,7 +218,7 @@ grub_normal_init_page (struct grub_term_output *term,
- 
-   grub_term_cls (term);
- 
--  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
-+  msg_formatted = grub_xasprintf (_("GRUB version %s"), PACKAGE_VERSION);
-   if (!msg_formatted)
-     return;
- 
-diff --git a/tests/util/grub-shell-tester.in b/tests/util/grub-shell-tester.in
-index 8a87109b152..9a4319d4f4f 100644
---- a/tests/util/grub-shell-tester.in
-+++ b/tests/util/grub-shell-tester.in
-@@ -56,7 +56,7 @@ for option in "$@"; do
- 	usage
- 	exit 0 ;;
-     -v | --version)
--	echo "$0 (GNU GRUB ${PACKAGE_VERSION})"
-+	echo "$0 (GRUB ${PACKAGE_VERSION})"
- 	exit 0 ;;
-     --modules=*)
- 	ms=`echo "$option" | sed -e 's/--modules=//'`
-diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
-index 496e1bab33c..e0570c88e15 100644
---- a/tests/util/grub-shell.in
-+++ b/tests/util/grub-shell.in
-@@ -243,7 +243,7 @@ for option in "$@"; do
- 	usage
- 	exit 0 ;;
-     -v | --version)
--	echo "$0 (GNU GRUB ${PACKAGE_VERSION})"
-+	echo "$0 (GRUB ${PACKAGE_VERSION})"
- 	exit 0 ;;
-     --trim)
- 	trim=1 ;;
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 00d4b220ccb..901745707f1 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
- CLASS="--class gnu-linux --class gnu --class os"
- 
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
--  OS=GNU/Linux
-+  OS="$(sed 's, release .*$,,g' /etc/system-release)"
- else
--  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  OS="${GRUB_DISTRIBUTOR}"
-   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
- fi
- 
-diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index 94dd8be1342..98ee5bc58dc 100644
---- a/util/grub.d/20_linux_xen.in
-+++ b/util/grub.d/20_linux_xen.in
-@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
- CLASS="--class gnu-linux --class gnu --class os --class xen"
- 
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
--  OS=GNU/Linux
-+  OS="$(sed 's, release .*$,,g' /etc/system-release)"
- else
--  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  OS="${GRUB_DISTRIBUTOR}"
-   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
- fi
- 

0020-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch

@@ -0,0 +1,38 @@
+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 4532266be68..58defdbd83f 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}"
+ 

0021-Add-support-for-UEFI-operating-systems-returned-by-o.patch

@@ -0,0 +1,46 @@
+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 515a68c7aa0..9b8f5968e2d 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

0022-Migrate-PPC-from-Yaboot-to-Grub2.patch

@@ -3,11 +3,8 @@ From: Mark Hamzy <hamzy@us.ibm.com>
 Date: Wed, 28 Mar 2012 14:46:41 -0500
 Subject: [PATCH] Migrate PPC from Yaboot to Grub2
 
-Add configuration support for serial terminal consoles.  This will set
-the maximum screen size so that text is not overwritten.
-
-Signed-off-by: Mark Hamzy <hamzy@us.ibm.com>
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+Add configuration support for serial terminal consoles.  This will set the
+maximum screen size so that text is not overwritten.
 ---
  Makefile.util.def              |   7 +++
  util/grub.d/20_ppc_terminfo.in | 114 +++++++++++++++++++++++++++++++++++++++++
@@ -15,11 +12,11 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  create mode 100644 util/grub.d/20_ppc_terminfo.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 9432365a9df..09bfcadd976 100644
+index 969d32f0097..8717774d510 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -517,6 +517,13 @@ script = {
-   installdir = grubconf;
+@@ -496,6 +496,13 @@ script = {
+   condition = COND_HOST_LINUX;
  };
  
 +script = {

0023-Add-fw_path-variable-revised.patch

@@ -8,19 +8,16 @@ found. It was originally written by Matthew Garrett, and adapted to fix the
 "No modules are loaded on grub2 network boot" issue:
 
 https://bugzilla.redhat.com/show_bug.cgi?id=857936
-
-Signed-off-by: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/kern/main.c   | 13 ++++++-------
  grub-core/normal/main.c | 25 ++++++++++++++++++++++++-
  2 files changed, 30 insertions(+), 8 deletions(-)
 
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 731c07c2901..463dafdba02 100644
+index 9cad0c4485c..8ab7794c47b 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
-@@ -128,16 +128,15 @@ grub_set_prefix_and_root (void)
+@@ -127,16 +127,15 @@ grub_set_prefix_and_root (void)
  
    grub_machine_get_bootlocation (&fwdevice, &fwpath);
  
@@ -44,10 +41,10 @@ index 731c07c2901..463dafdba02 100644
      }
  
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index d3f53d93d87..08f48c71df1 100644
+index 222e239c1be..394bfbea868 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -339,7 +339,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
+@@ -338,7 +338,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;

0024-Pass-x-hex-hex-straight-through-unmolested.patch

@@ -3,20 +3,17 @@ 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       | 25 +++++++++++++++++++++++--
+ grub-core/lib/cmdline.c       | 34 ++++++++++++++++++++++++++++++++--
  grub-core/script/execute.c    | 43 +++++++++++++++++++++++++++++++++++++------
- 3 files changed, 75 insertions(+), 9 deletions(-)
+ 3 files changed, 84 insertions(+), 9 deletions(-)
 
 diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
-index ed65865050a..5455242c352 100644
+index 4a106ca040b..560d437cdc6 100644
 --- a/grub-core/commands/wildcard.c
 +++ b/grub-core/commands/wildcard.c
-@@ -488,6 +488,12 @@ check_file (const char *dir, const char *basename)
+@@ -462,6 +462,12 @@ check_file (const char *dir, const char *basename)
    return ctx.found;
  }
  
@@ -29,7 +26,7 @@ index ed65865050a..5455242c352 100644
  static void
  unescape (char *out, const char *in, const char *end)
  {
-@@ -496,7 +502,15 @@ unescape (char *out, const char *in, const char *end)
+@@ -470,7 +476,15 @@ unescape (char *out, const char *in, const char *end)
  
    for (optr = out, iptr = in; iptr < end;)
      {
@@ -47,7 +44,7 @@ index ed65865050a..5455242c352 100644
  	  *optr++ = iptr[1];
  	  iptr += 2;
 diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
-index ed0b149dca5..8e2294d8ff6 100644
+index ed0b149dca5..e0fb0a9e48a 100644
 --- a/grub-core/lib/cmdline.c
 +++ b/grub-core/lib/cmdline.c
 @@ -20,6 +20,12 @@
@@ -78,12 +75,21 @@ index ed0b149dca5..8e2294d8ff6 100644
  	size++;
        else if (*c == ' ')
  	space = 1;
-@@ -86,7 +98,16 @@ grub_create_loader_cmdline (int argc, char *argv[], char *buf,
+@@ -86,7 +98,25 @@ grub_create_loader_cmdline (int argc, char *argv[], char *buf,
  
        while (*c)
  	{
 -	  if (*c == '\\' || *c == '\'' || *c == '"')
-+	  if (*c == '\\' && *(c+1) == 'x' &&
++	  if (*c == ' ')
++	    {
++	      *buf++ = '\\';
++	      *buf++ = 'x';
++	      *buf++ = '2';
++	      *buf++ = '0';
++	      c++;
++	      continue;
++	    }
++	  else if (*c == '\\' && *(c+1) == 'x' &&
 +		   is_hex(*(c+2)) && is_hex(*(c+3)))
 +	    {
 +	      *buf++ = *c++;
@@ -97,7 +103,7 @@ index ed0b149dca5..8e2294d8ff6 100644
  
  	  *buf++ = *c;
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index dab8fd2aeb0..c19b4bf700e 100644
+index 0d05d6b0709..ba38b5e8aef 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
 @@ -56,6 +56,12 @@ static struct grub_script_scope *scope = 0;

0025-Add-X-option-to-printf-functions.patch

@@ -0,0 +1,55 @@
+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 cd63a8cea73..2656a670e09 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':
+ 	  {

0026-Search-for-specific-config-file-for-netboot.patch

@@ -0,0 +1,200 @@
+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 d5d726a315e..06454564b8f 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, GRUB_FILE_TYPE_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 394bfbea868..9ef98481f70 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 556c54e579f..ff6d347f7da 100644
+--- a/include/grub/net.h
++++ b/include/grub/net.h
+@@ -578,4 +578,7 @@ extern char *grub_net_default_server;
+ 
+ #define VLANTAG_IDENTIFIER 0x8100
+ 
++grub_err_t
++grub_net_search_configfile (char *config);
++
+ #endif /* ! GRUB_NET_HEADER */

0027-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch

@@ -14,7 +14,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
 Signed-off-by: Will Thompson <wjt@endlessm.com>
 ---
  grub-core/Makefile.core.def    |   11 +
- grub-core/commands/blscfg.c    | 1177 ++++++++++++++++++++++++++++++++++++++++
+ grub-core/commands/blscfg.c    | 1096 ++++++++++++++++++++++++++++++++++++++++
  grub-core/commands/legacycfg.c |    5 +-
  grub-core/commands/loadenv.c   |   77 +--
  grub-core/commands/menuentry.c |   20 +-
@@ -23,15 +23,15 @@ Signed-off-by: Will Thompson <wjt@endlessm.com>
  include/grub/compiler.h        |    2 +
  include/grub/menu.h            |   13 +
  include/grub/normal.h          |    2 +-
- 10 files changed, 1324 insertions(+), 82 deletions(-)
+ 10 files changed, 1243 insertions(+), 82 deletions(-)
  create mode 100644 grub-core/commands/blscfg.c
  create mode 100644 grub-core/commands/loadenv.h
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 0bffbfea917..47c0fc755a2 100644
+index 41b5e16a3ce..57e253ab1a1 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -842,6 +842,16 @@ module = {
+@@ -811,6 +811,16 @@ module = {
    common = commands/blocklist.c;
  };
  
@@ -48,7 +48,7 @@ index 0bffbfea917..47c0fc755a2 100644
  module = {
    name = boot;
    common = commands/boot.c;
-@@ -1009,6 +1019,7 @@ module = {
+@@ -988,6 +998,7 @@ module = {
  module = {
    name = loadenv;
    common = commands/loadenv.c;
@@ -58,10 +58,10 @@ index 0bffbfea917..47c0fc755a2 100644
  
 diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
 new file mode 100644
-index 00000000000..e907a6a5d28
+index 00000000000..54458b14518
 --- /dev/null
 +++ b/grub-core/commands/blscfg.c
-@@ -0,0 +1,1177 @@
+@@ -0,0 +1,1096 @@
 +/*-*- Mode: C; c-basic-offset: 2; indent-tabs-mode: t -*-*/
 +
 +/* bls.c - implementation of the boot loader spec */
@@ -227,8 +227,8 @@ index 00000000000..e907a6a5d28
 +
 +    /* loop through each version segment of str1 and str2 and compare them */
 +    while (*one || *two) {
-+	while (*one && !grub_isalnum(*one) && *one != '~' && *one != '+') one++;
-+	while (*two && !grub_isalnum(*two) && *two != '~' && *two != '+') two++;
++	while (*one && !grub_isalnum(*one) && *one != '~') one++;
++	while (*two && !grub_isalnum(*two) && *two != '~') two++;
 +
 +	/* handle the tilde separator, it sorts before everything else */
 +	if (*one == '~' || *two == '~') {
@@ -239,21 +239,6 @@ index 00000000000..e907a6a5d28
 +	    continue;
 +	}
 +
-+	/*
-+	 * Handle plus separator. Concept is the same as tilde,
-+	 * except that if one of the strings ends (base version),
-+	 * the other is considered as higher version.
-+	 */
-+	if (*one == '+' || *two == '+') {
-+	    if (!*one) return -1;
-+	    if (!*two) return 1;
-+	    if (*one != '+') goto_return (1);
-+	    if (*two != '+') goto_return (-1);
-+	    one++;
-+	    two++;
-+	    continue;
-+	}
-+
 +	/* If we ran to the end of either, we are finished with the loop */
 +	if (!(*one && *two)) break;
 +
@@ -664,52 +649,43 @@ index 00000000000..e907a6a5d28
 +      list[nlist] = NULL;
 +  }
 +
-+  if (!nlist)
-+    {
-+      grub_free (list);
-+      return NULL;
-+    }
-+
 +  if (num)
 +    *num = nlist;
 +
 +  return list;
 +}
 +
-+static char *field_append(bool is_var, char *buffer, const char *start, const char *end)
++static char *field_append(bool is_var, char *buffer, char *start, char *end)
 +{
-+  char *tmp = grub_strndup(start, end - start + 1);
-+  const char *field = tmp;
-+  int term = is_var ? 2 : 1;
++  char *temp = grub_strndup(start, end - start + 1);
++  const char *field = temp;
 +
 +  if (is_var) {
-+    field = grub_env_get (tmp);
++    field = grub_env_get (temp);
 +    if (!field)
 +      return buffer;
 +  }
 +
-+  if (!buffer)
-+    buffer = grub_zalloc (grub_strlen(field) + term);
-+  else
-+    buffer = grub_realloc (buffer, grub_strlen(buffer) + grub_strlen(field) + term);
++  if (!buffer) {
++    buffer = grub_strdup(field);
++    if (!buffer)
++      return NULL;
++  } else {
++    buffer = grub_realloc (buffer, grub_strlen(buffer) + grub_strlen(field));
++    if (!buffer)
++      return NULL;
 +
-+  if (!buffer)
-+    return NULL;
-+
-+  tmp = buffer + grub_strlen(buffer);
-+  tmp = grub_stpcpy (tmp, field);
-+
-+  if (is_var)
-+      tmp = grub_stpcpy (tmp, " ");
++    grub_stpcpy (buffer + grub_strlen(buffer), field);
++  }
 +
 +  return buffer;
 +}
 +
-+static char *expand_val(const char *value)
++static char *expand_val(char *value)
 +{
 +  char *buffer = NULL;
-+  const char *start = value;
-+  const char *end = value;
++  char *start = value;
++  char *end = value;
 +  bool is_var = false;
 +
 +  if (!value)
@@ -730,8 +706,6 @@ index 00000000000..e907a6a5d28
 +	buffer = field_append(is_var, buffer, start, end);
 +	is_var = false;
 +	start = value;
-+	if (*start == ' ')
-+	  start++;
 +      }
 +    }
 +
@@ -788,8 +762,6 @@ index 00000000000..e907a6a5d28
 +  const char *early_initrd = NULL;
 +  char **early_initrds = NULL;
 +  char *initrd_prefix = NULL;
-+  char *devicetree = NULL;
-+  char *dt = NULL;
 +  char *id = entry->filename;
 +  char *dotconf = id;
 +  char *hotkey = NULL;
@@ -801,7 +773,6 @@ index 00000000000..e907a6a5d28
 +
 +  char *src = NULL;
 +  int i, index;
-+  bool add_dt_prefix = false;
 +
 +  grub_dprintf("blscfg", "%s got here\n", __func__);
 +  clinux = bls_get_val (entry, "linux", NULL);
@@ -829,14 +800,6 @@ index 00000000000..e907a6a5d28
 +
 +  initrds = bls_make_list (entry, "initrd", NULL);
 +
-+  devicetree = expand_val (bls_get_val (entry, "devicetree", NULL));
-+
-+  if (!devicetree)
-+    {
-+      devicetree = expand_val (grub_env_get("devicetree"));
-+      add_dt_prefix = true;
-+    }
-+
 +  hotkey = bls_get_val (entry, "grub_hotkey", NULL);
 +  users = expand_val (bls_get_val (entry, "grub_users", NULL));
 +  classes = bls_make_list (entry, "grub_class", NULL);
@@ -902,6 +865,7 @@ index 00000000000..e907a6a5d28
 +	  goto finish;
 +	}
 +
++
 +      tmp = grub_stpcpy(initrd, "initrd");
 +      for (i = 0; early_initrds != NULL && early_initrds[i] != NULL; i++)
 +	{
@@ -921,68 +885,21 @@ index 00000000000..e907a6a5d28
 +      tmp = grub_stpcpy (tmp, "\n");
 +    }
 +
-+  if (devicetree)
-+    {
-+      char *prefix = NULL;
-+      int dt_size;
-+
-+      if (add_dt_prefix)
-+	{
-+	  prefix = grub_strrchr (clinux, '/');
-+	  prefix = grub_strndup(clinux, prefix - clinux + 1);
-+	  if (!prefix)
-+	    {
-+	      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
-+	      goto finish;
-+	    }
-+	}
-+
-+      dt_size = sizeof("devicetree " GRUB_BOOT_DEVICE) + grub_strlen(devicetree) + 1;
-+
-+      if (add_dt_prefix)
-+	{
-+	  dt_size += grub_strlen(prefix);
-+	}
-+
-+      dt = grub_malloc (dt_size);
-+      if (!dt)
-+        {
-+          grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
-+        goto finish;
-+        }
-+      char *tmp = dt;
-+      tmp = grub_stpcpy (dt, "devicetree");
-+      tmp = grub_stpcpy (tmp, " " GRUB_BOOT_DEVICE);
-+      if (add_dt_prefix)
-+        tmp = grub_stpcpy (tmp, prefix);
-+      tmp = grub_stpcpy (tmp, devicetree);
-+      tmp = grub_stpcpy (tmp, "\n");
-+
-+      grub_free(prefix);
-+    }
-+
-+  grub_dprintf ("blscfg2", "devicetree %s for id:\"%s\"\n", dt, id);
-+
-+  const char *sdval = grub_env_get("save_default");
-+  bool savedefault = ((NULL != sdval) && (grub_strcmp(sdval, "true") == 0));
-+  src = grub_xasprintf ("%sload_video\n"
++  src = grub_xasprintf ("load_video\n"
 +			"set gfxpayload=keep\n"
 +			"insmod gzio\n"
 +			"linux %s%s%s%s\n"
-+			"%s%s",
-+			savedefault ? "savedefault\n" : "",
++			"%s",
 +			GRUB_BOOT_DEVICE, clinux, options ? " " : "", options ? options : "",
-+			initrd ? initrd : "", dt ? dt : "");
++			initrd ? initrd : "");
 +
 +  grub_normal_add_menu_entry (argc, argv, classes, id, users, hotkey, NULL, src, 0, &index, entry);
 +  grub_dprintf ("blscfg", "Added entry %d id:\"%s\"\n", index, id);
 +
 +finish:
-+  grub_free (dt);
 +  grub_free (initrd);
 +  grub_free (initrd_prefix);
 +  grub_free (early_initrds);
-+  grub_free (devicetree);
 +  grub_free (initrds);
 +  grub_free (options);
 +  grub_free (classes);
@@ -1092,12 +1009,14 @@ index 00000000000..e907a6a5d28
 +  if (!devid) {
 +#ifdef GRUB_MACHINE_EMU
 +    devid = "host";
-+#else
++#elif defined(GRUB_MACHINE_EFI)
 +    devid = grub_env_get ("root");
++#else
++    devid = grub_env_get ("boot");
 +#endif
 +    if (!devid)
 +      return grub_error (GRUB_ERR_FILE_NOT_FOUND,
-+			 N_("variable `%s' isn't set"), "root");
++			 N_("variable `%s' isn't set"), "boot");
 +  }
 +
 +  grub_dprintf ("blscfg", "opening %s\n", devid);
@@ -1240,10 +1159,10 @@ index 00000000000..e907a6a5d28
 +  grub_unregister_extcmd (oldcmd);
 +}
 diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
-index e9e9d94eff5..2c5d1a0ef9a 100644
+index db7a8f00273..891eac5a33f 100644
 --- a/grub-core/commands/legacycfg.c
 +++ b/grub-core/commands/legacycfg.c
-@@ -143,7 +143,7 @@ legacy_file (const char *filename)
+@@ -133,7 +133,7 @@ legacy_file (const char *filename)
  	    args[0] = oldname;
  	    grub_normal_add_menu_entry (1, args, NULL, NULL, "legacy",
  					NULL, NULL,
@@ -1252,7 +1171,7 @@ index e9e9d94eff5..2c5d1a0ef9a 100644
  	    grub_free (args);
  	    entrysrc[0] = 0;
  	    grub_free (oldname);
-@@ -205,7 +205,8 @@ legacy_file (const char *filename)
+@@ -186,7 +186,8 @@ legacy_file (const char *filename)
  	}
        args[0] = entryname;
        grub_normal_add_menu_entry (1, args, NULL, NULL, NULL,
@@ -1263,7 +1182,7 @@ index e9e9d94eff5..2c5d1a0ef9a 100644
      }
  
 diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
-index 16644584978..dfcb19e0ff8 100644
+index 3fd664aac33..163b9a09042 100644
 --- a/grub-core/commands/loadenv.c
 +++ b/grub-core/commands/loadenv.c
 @@ -28,6 +28,8 @@
@@ -1358,7 +1277,7 @@ index 16644584978..dfcb19e0ff8 100644
  grub_cmd_load_env (grub_extcmd_context_t ctxt, int argc, char **args)
  {
 diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
-index 720e6d8ea3b..b194123eb67 100644
+index 2c5363da7f5..9faf2be0f64 100644
 --- a/grub-core/commands/menuentry.c
 +++ b/grub-core/commands/menuentry.c
 @@ -78,7 +78,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
@@ -1382,7 +1301,7 @@ index 720e6d8ea3b..b194123eb67 100644
 +  grub_dprintf ("menu", "menu_id:\"%s\"\n", menu_id);
  
    /* Save argc, args to pass as parameters to block arg later. */
-   menu_args = grub_calloc (argc + 1, sizeof (char *));
+   menu_args = grub_malloc (sizeof (char*) * (argc + 1));
 @@ -170,8 +173,12 @@ grub_normal_add_menu_entry (int argc, const char **args,
    }
  
@@ -1430,11 +1349,11 @@ index 720e6d8ea3b..b194123eb67 100644
    src[len - 1] = ch;
    args[argc - 1] = src;
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 08f48c71df1..1317279c081 100644
+index 9ef98481f70..a326b192c89 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -21,6 +21,7 @@
- #include <grub/net.h>
+@@ -20,6 +20,7 @@
+ #include <grub/kernel.h>
  #include <grub/normal.h>
  #include <grub/dl.h>
 +#include <grub/menu.h>
@@ -1553,11 +1472,11 @@ index 00000000000..952f46121bd
 +  return 0;
 +}
 diff --git a/include/grub/compiler.h b/include/grub/compiler.h
-index 0c5519387b2..441a9eca07c 100644
+index c9e1d7a73dc..9859ff4cc79 100644
 --- a/include/grub/compiler.h
 +++ b/include/grub/compiler.h
-@@ -56,4 +56,6 @@
- #  define CLANG_PREREQ(maj,min) 0
+@@ -48,4 +48,6 @@
+ #  define WARN_UNUSED_RESULT
  #endif
  
 +#define UNUSED __attribute__((__unused__))

0028-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 7516a015be0..7b355115dd4 100644
+index 9ecbcfb5b43..c645351dd2a 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -252,7 +252,8 @@ export GRUB_DEFAULT \
+@@ -254,7 +254,8 @@ export GRUB_DEFAULT \
    GRUB_ENABLE_CRYPTODISK \
    GRUB_BADRAM \
    GRUB_OS_PROBER_SKIP_LIST \
@@ -34,10 +34,10 @@ index 7516a015be0..7b355115dd4 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 cc393be7eda..00d4b220ccb 100644
+index 58defdbd83f..dd3128440c4 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -155,6 +155,13 @@ EOF
+@@ -153,6 +153,13 @@ EOF
      sed "s/^/$submenu_indentation/" << EOF
  	echo	'$(echo "$message" | grub_quote)'
  	initrd	$(echo $initrd_path)
@@ -51,7 +51,7 @@ index cc393be7eda..00d4b220ccb 100644
  EOF
    fi
    sed "s/^/$submenu_indentation/" << EOF
-@@ -250,6 +257,14 @@ for linux in ${reverse_sorted_list}; do
+@@ -236,6 +243,14 @@ while [ "x$list" != "x" ] ; do
      gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
    fi
  

0029-Don-t-write-messages-to-the-screen.patch

@@ -0,0 +1,176 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <william.jon.mccann@gmail.com>
+Date: Wed, 15 May 2013 13:30:20 -0400
+Subject: [PATCH] Don't write messages to the screen
+
+Writing messages to the screen before the menus or boot splash
+happens so quickly it looks like something is wrong and isn't
+very appealing.
+---
+ grub-core/gettext/gettext.c       | 25 +++++--------------------
+ grub-core/kern/main.c             |  5 -----
+ grub-core/boot/i386/pc/boot.S     |  3 ---
+ grub-core/boot/i386/pc/diskboot.S |  5 -----
+ util/grub.d/10_linux.in           |  7 -------
+ 5 files changed, 5 insertions(+), 40 deletions(-)
+
+diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
+index 4d02e62c109..84d520cd494 100644
+--- a/grub-core/gettext/gettext.c
++++ b/grub-core/gettext/gettext.c
+@@ -434,16 +434,12 @@ static char *
+ grub_gettext_env_write_lang (struct grub_env_var *var
+ 			     __attribute__ ((unused)), const char *val)
+ {
+-  grub_err_t err;
++  grub_err_t __attribute__((__unused__)) err;
+   err = grub_gettext_init_ext (&main_context, val, grub_env_get ("locale_dir"),
+ 			       grub_env_get ("prefix"));
+-  if (err)
+-    grub_print_error ();
+ 
+   err = grub_gettext_init_ext (&secondary_context, val,
+ 			       grub_env_get ("secondary_locale_dir"), 0);
+-  if (err)
+-    grub_print_error ();
+ 
+   return grub_strdup (val);
+ }
+@@ -451,23 +447,19 @@ grub_gettext_env_write_lang (struct grub_env_var *var
+ void
+ grub_gettext_reread_prefix (const char *val)
+ {
+-  grub_err_t err;
++  grub_err_t __attribute__((__unused__)) err;
+   err = grub_gettext_init_ext (&main_context, grub_env_get ("lang"), 
+ 			       grub_env_get ("locale_dir"),
+ 			       val);
+-  if (err)
+-    grub_print_error ();
+ }
+ 
+ static char *
+ read_main (struct grub_env_var *var
+ 	   __attribute__ ((unused)), const char *val)
+ {
+-  grub_err_t err;
++  grub_err_t __attribute__((__unused__)) err;
+   err = grub_gettext_init_ext (&main_context, grub_env_get ("lang"), val,
+ 			       grub_env_get ("prefix"));
+-  if (err)
+-    grub_print_error ();
+   return grub_strdup (val);
+ }
+ 
+@@ -475,12 +467,9 @@ static char *
+ read_secondary (struct grub_env_var *var
+ 		__attribute__ ((unused)), const char *val)
+ {
+-  grub_err_t err;
++  grub_err_t __attribute__((__unused__)) err;
+   err = grub_gettext_init_ext (&secondary_context, grub_env_get ("lang"), val,
+ 			       0);
+-  if (err)
+-    grub_print_error ();
+-
+   return grub_strdup (val);
+ }
+ 
+@@ -500,18 +489,14 @@ grub_cmd_translate (grub_command_t cmd __attribute__ ((unused)),
+ GRUB_MOD_INIT (gettext)
+ {
+   const char *lang;
+-  grub_err_t err;
++  grub_err_t __attribute__((__unused__)) err;
+ 
+   lang = grub_env_get ("lang");
+ 
+   err = grub_gettext_init_ext (&main_context, lang, grub_env_get ("locale_dir"),
+ 			       grub_env_get ("prefix"));
+-  if (err)
+-    grub_print_error ();
+   err = grub_gettext_init_ext (&secondary_context, lang,
+ 			       grub_env_get ("secondary_locale_dir"), 0);
+-  if (err)
+-    grub_print_error ();
+ 
+   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 8ab7794c47b..da47b18b50e 100644
+--- a/grub-core/kern/main.c
++++ b/grub-core/kern/main.c
+@@ -268,11 +268,6 @@ grub_main (void)
+ 
+   grub_boot_time ("After machine init.");
+ 
+-  /* Hello.  */
+-  grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
+-  grub_printf ("Welcome to GRUB!\n\n");
+-  grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
+-
+   grub_load_config ();
+ 
+   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 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:
+ 	/* save drive reference first thing! */
+ 	pushw	%dx
+ 
+-	/* print a notification message on the screen */
+-	MSG(notification_string)
+-
+ 	/* set %si to the disk address packet */
+ 	movw	$disk_address_packet, %si
+ 
+diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
+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:
+ 	/* save drive reference first thing! */
+ 	pushw	%dx
+ 
+-	/* print a notification message on the screen */
+-	pushw	%si
+-	MSG(notification_string)
+-	popw	%si
+-
+ 	/* this sets up for the first run through "bootloop" */
+ 	movw	$LOCAL(firstlist), %di
+ 
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index dd3128440c4..ceb413fc2e3 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -138,27 +138,20 @@ linux_entry ()
+     fi
+     printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
+   fi
+-  message="$(gettext_printf "Loading Linux %s ..." ${version})"
+   sed "s/^/$submenu_indentation/" << EOF
+-	echo	'$(echo "$message" | grub_quote)'
+ 	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
+ EOF
+   if test -n "${initrd}" ; then
+-    # TRANSLATORS: ramdisk isn't identifier. Should be translated.
+-    message="$(gettext_printf "Loading initial ramdisk ...")"
+     initrd_path=
+     for i in ${initrd}; do
+       initrd_path="${initrd_path} ${rel_dirname}/${i}"
+     done
+     sed "s/^/$submenu_indentation/" << EOF
+-	echo	'$(echo "$message" | grub_quote)'
+ 	initrd	$(echo $initrd_path)
+ EOF
+   fi
+   if test -n "${fdt}" ; then
+-    message="$(gettext_printf "Loading fdt ...")"
+     sed "s/^/$submenu_indentation/" << EOF
+-	echo	'$(echo "$message" | grub_quote)'
+ 	devicetree	${rel_dirname}/${fdt}
+ EOF
+   fi

0030-Don-t-print-GNU-GRUB-header.patch

@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <william.jon.mccann@gmail.com>
+Date: Wed, 15 May 2013 13:53:48 -0400
+Subject: [PATCH] Don't print GNU GRUB header
+
+No one cares.
+---
+ grub-core/normal/main.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index a326b192c89..09d0dfe76f1 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -208,15 +208,16 @@ read_config_file (const char *config)
+ /* Initialize the screen.  */
+ void
+ grub_normal_init_page (struct grub_term_output *term,
+-		       int y)
++		       int y __attribute__((__unused__)))
+ {
++  grub_term_cls (term);
++
++#if 0
+   grub_ssize_t msg_len;
+   int posx;
+   char *msg_formatted;
+   grub_uint32_t *unicode_msg;
+   grub_uint32_t *last_position;
+- 
+-  grub_term_cls (term);
+ 
+   msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
+   if (!msg_formatted)
+@@ -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);
++#endif
+ }
+ 
+ static void

0031-Don-t-add-to-highlighted-row.patch

@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <william.jon.mccann@gmail.com>
+Date: Wed, 15 May 2013 17:49:45 -0400
+Subject: [PATCH] Don't add '*' to highlighted row
+
+It is already highlighted.
+---
+ grub-core/normal/menu_text.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
+index e22bb91f6e8..a3d1f23f68f 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,
+       unicode_title[i] = ' ';
+ 
+   if (data->geo.num_entries > 1)
+-    grub_putcode (highlight ? '*' : ' ', data->term);
++    grub_putcode (' ', data->term);
+ 
+   grub_print_ucs4_menu (unicode_title,
+ 			unicode_title + len,

0032-Message-string-cleanups.patch

@@ -0,0 +1,68 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <william.jon.mccann@gmail.com>
+Date: Fri, 7 Jun 2013 11:09:04 -0400
+Subject: [PATCH] Message string cleanups
+
+Make use of terminology consistent. Remove jargon.
+---
+ grub-core/normal/menu_text.c | 21 +++++++++------------
+ 1 file changed, 9 insertions(+), 12 deletions(-)
+
+diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
+index a3d1f23f68f..64a83862f66 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)
+ 
+   if (edit)
+     {
+-      ret += grub_print_message_indented_real (_("Minimum Emacs-like screen editing is \
+-supported. TAB lists completions. Press Ctrl-x or F10 to boot, Ctrl-c or F2 for a \
+-command-line or ESC to discard edits and return to the GRUB menu."),
++      ret += grub_print_message_indented_real (_("Press Ctrl-x or F10 to start, Ctrl-c or F2 for a \
++command prompt or Escape to discard edits and return to the menu. Pressing Tab lists possible completions."),
+ 					       STANDARD_MARGIN, STANDARD_MARGIN,
+ 					       term, dry_run);
+     }
+@@ -167,8 +166,8 @@ command-line or ESC to discard edits and return to the GRUB menu."),
+     {
+       char *msg_translated;
+ 
+-      msg_translated = grub_xasprintf (_("Use the %C and %C keys to select which "
+-					 "entry is highlighted."),
++      msg_translated = grub_xasprintf (_("Use the %C and %C keys to change the "
++					 "selection."),
+ 				       GRUB_UNICODE_UPARROW,
+ 				       GRUB_UNICODE_DOWNARROW);
+       if (!msg_translated)
+@@ -181,17 +180,15 @@ command-line or ESC to discard edits and return to the GRUB menu."),
+       if (nested)
+ 	{
+ 	  ret += grub_print_message_indented_real
+-	    (_("Press enter to boot the selected OS, "
+-	       "`e' to edit the commands before booting "
+-	       "or `c' for a command-line. ESC to return previous menu."),
++	    (_("Press 'e' to edit the selected item, "
++	       "or 'c' for a command prompt. Press Escape to return to the previous menu."),
+ 	     STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
+ 	}
+       else
+ 	{
+ 	  ret += grub_print_message_indented_real
+-	    (_("Press enter to boot the selected OS, "
+-	       "`e' to edit the commands before booting "
+-	       "or `c' for a command-line."),
++	    (_("Press 'e' to edit the selected item, "
++	       "or 'c' for a command prompt."),
+ 	     STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
+ 	}	
+     }
+@@ -443,7 +440,7 @@ menu_text_print_timeout (int timeout, void *dataptr)
+       || data->timeout_msg == TIMEOUT_TERSE_NO_MARGIN)
+     msg_translated = grub_xasprintf (_("%ds"), timeout);
+   else
+-    msg_translated = grub_xasprintf (_("The highlighted entry will be executed automatically in %ds."), timeout);
++    msg_translated = grub_xasprintf (_("The selected entry will be started automatically in %ds."), timeout);
+   if (!msg_translated)
+     {
+       grub_print_error ();

0033-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch

@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <william.jon.mccann@gmail.com>
+Date: Fri, 7 Jun 2013 14:08:23 -0400
+Subject: [PATCH] Fix border spacing now that we aren't displaying it
+
+---
+ grub-core/normal/menu_text.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
+index 64a83862f66..1062d64ee29 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,
+   int empty_lines = 1;
+   int version_msg = 1;
+ 
+-  geo->border = 1;
+-  geo->first_entry_x = 1 /* margin */ + 1 /* border */;
++  geo->border = 0;
++  geo->first_entry_x = 0 /* margin */ + 0 /* border */;
+   geo->entry_width = grub_term_width (term) - 5;
+ 
+   geo->first_entry_y = 2 /* two empty lines*/
+-    + 1 /* GNU GRUB version text  */ + 1 /* top border */;
++    + 0 /* GNU GRUB version text  */ + 1 /* top border */;
+ 
+   geo->timeout_lines = 2;
+ 

0034-Use-the-correct-indentation-for-the-term-help-text.patch

@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <william.jon.mccann@gmail.com>
+Date: Fri, 7 Jun 2013 14:08:49 -0400
+Subject: [PATCH] Use the correct indentation for the term help text
+
+That is consistent with the menu help text
+---
+ grub-core/normal/main.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index 09d0dfe76f1..7f61c5b618b 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -432,8 +432,8 @@ grub_normal_reader_init (int nested)
+     grub_normal_init_page (term, 1);
+     grub_term_setcursor (term, 1);
+ 
+-    if (grub_term_width (term) > 3 + STANDARD_MARGIN + 20)
+-      grub_print_message_indented (msg_formatted, 3, STANDARD_MARGIN, term);
++    if (grub_term_width (term) > 2 * STANDARD_MARGIN + 20)
++      grub_print_message_indented (msg_formatted, STANDARD_MARGIN, STANDARD_MARGIN, term);
+     else
+       grub_print_message_indented (msg_formatted, 0, 0, term);
+     grub_putcode ('\n', term);

0035-Indent-menu-entries.patch

@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <william.jon.mccann@gmail.com>
+Date: Fri, 7 Jun 2013 14:30:55 -0400
+Subject: [PATCH] Indent menu entries
+
+---
+ grub-core/normal/menu_text.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
+index 1062d64ee29..ecc60f99fc3 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,
+       unicode_title[i] = ' ';
+ 
+   if (data->geo.num_entries > 1)
+-    grub_putcode (' ', data->term);
++    for (i = 0; i < STANDARD_MARGIN; i++)
++      grub_putcode (' ', data->term);
+ 
+   grub_print_ucs4_menu (unicode_title,
+ 			unicode_title + len,

0036-Fix-margins.patch

@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <william.jon.mccann@gmail.com>
+Date: Fri, 7 Jun 2013 14:59:36 -0400
+Subject: [PATCH] Fix margins
+
+---
+ grub-core/normal/menu_text.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
+index ecc60f99fc3..0e43f2c10cc 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,
+   int version_msg = 1;
+ 
+   geo->border = 0;
+-  geo->first_entry_x = 0 /* margin */ + 0 /* border */;
+-  geo->entry_width = grub_term_width (term) - 5;
++  geo->first_entry_x = 0; /* no margin */
++  geo->entry_width = grub_term_width (term) - 1;
+ 
+-  geo->first_entry_y = 2 /* two empty lines*/
+-    + 0 /* GNU GRUB version text  */ + 1 /* top border */;
++  geo->first_entry_y = 3; /* three empty lines*/
+ 
+   geo->timeout_lines = 2;
+ 
+   /* 3 lines for timeout message and bottom margin.  2 lines for the border.  */
+   geo->num_entries = grub_term_height (term) - geo->first_entry_y
+-    - 1 /* bottom border */
+     - 1 /* empty line before info message*/
+     - geo->timeout_lines /* timeout */
+     - 1 /* empty final line  */;

0037-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch

@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Fri, 21 Jun 2013 14:44:08 -0400
+Subject: [PATCH] Use -2 instead of -1 for our right-hand margin, so
+ linewrapping works (#976643).
+
+Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
+---
+ grub-core/normal/menu_text.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
+index 0e43f2c10cc..537d4bf86ff 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,
+ 
+   geo->border = 0;
+   geo->first_entry_x = 0; /* no margin */
+-  geo->entry_width = grub_term_width (term) - 1;
++  geo->entry_width = grub_term_width (term) - 2;
+ 
+   geo->first_entry_y = 3; /* three empty lines*/
+ 

0037-btrfs-fix-a-bad-null-check.patch

@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Mon, 8 Jan 2024 15:41:52 -0500
-Subject: [PATCH] btrfs: fix a bad null check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-current gcc complains:
-
-  grub-core/fs/btrfs.c: In function ‘grub_cmd_btrfs_info’:
-  grub-core/fs/btrfs.c:2745:7: error: the comparison will always evaluate as ‘true’ for the address of ‘label’ will never be NULL [-Werror=address]
-   2745 |   if (data->sblock.label)
-        |       ^~~~
-  grub-core/fs/btrfs.c:92:8: note: ‘label’ declared here
-     92 |   char label[0x100];
-        |        ^~~~~
-  cc1: all warnings being treated as errors
-
-Obviously this check should be on the first data byte instead of the
-symbol itself.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/fs/btrfs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index f14fe9c1bda..8e2b1e9f7bc 100644
---- a/grub-core/fs/btrfs.c
-+++ b/grub-core/fs/btrfs.c
-@@ -2625,7 +2625,7 @@ grub_cmd_btrfs_info (grub_command_t cmd __attribute__ ((unused)), int argc,
-       return grub_error (GRUB_ERR_BAD_ARGUMENT, "failed to open fs");
-     }
- 
--  if (data->sblock.label)
-+  if (data->sblock.label[0])
-     grub_printf("Label: '%s' ", data->sblock.label);
-   else
-     grub_printf("Label: none ");

0038-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 6a316a5ba77..c2d8b093762 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_

0039-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch

@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 28 Oct 2013 10:13:27 -0400
+Subject: [PATCH] F10 doesn't work on serial, so don't tell the user to hit it
+ (#987443)
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/normal/menu_text.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
+index 537d4bf86ff..452d55bf9ff 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)
+ 
+   if (edit)
+     {
+-      ret += grub_print_message_indented_real (_("Press Ctrl-x or F10 to start, Ctrl-c or F2 for a \
++      ret += grub_print_message_indented_real (_("Press Ctrl-x to start, Ctrl-c for a \
+ command prompt or Escape to discard edits and return to the menu. Pressing Tab lists possible completions."),
+ 					       STANDARD_MARGIN, STANDARD_MARGIN,
+ 					       term, dry_run);

0040-Don-t-say-GNU-Linux-in-generated-menus.patch

@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 14 Mar 2011 14:27:42 -0400
+Subject: [PATCH] Don't say "GNU/Linux" in generated menus.
+
+---
+ util/grub.d/10_linux.in     | 4 ++--
+ util/grub.d/20_linux_xen.in | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index ceb413fc2e3..2b402d85a52 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
+ CLASS="--class gnu-linux --class gnu --class os"
+ 
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+-  OS=GNU/Linux
++  OS="$(sed 's, release .*$,,g' /etc/system-release)"
+ else
+-  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++  OS="${GRUB_DISTRIBUTOR}"
+   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
+ fi
+ 
+diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
+index 96179ea613c..47e0d3f5cd6 100644
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
+ CLASS="--class gnu-linux --class gnu --class os --class xen"
+ 
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+-  OS=GNU/Linux
++  OS="$(sed 's, release .*$,,g' /etc/system-release)"
+ else
+-  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++  OS="${GRUB_DISTRIBUTOR}"
+   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
+ fi
+ 

0041-Don-t-draw-a-border-around-the-menu.patch

@@ -0,0 +1,71 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <william.jon.mccann@gmail.com>
+Date: Wed, 15 May 2013 16:47:33 -0400
+Subject: [PATCH] Don't draw a border around the menu
+
+It looks cleaner without it.
+---
+ grub-core/normal/menu_text.c | 43 -------------------------------------------
+ 1 file changed, 43 deletions(-)
+
+diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
+index 452d55bf9ff..1ed2bd92cf8 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,
+   grub_print_message_indented_real (msg, margin_left, margin_right, term, 0);
+ }
+ 
+-static void
+-draw_border (struct grub_term_output *term, const struct grub_term_screen_geometry *geo)
+-{
+-  int i;
+-
+-  grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
+-
+-  grub_term_gotoxy (term, (struct grub_term_coordinate) { geo->first_entry_x - 1,
+-	geo->first_entry_y - 1 });
+-  grub_putcode (GRUB_UNICODE_CORNER_UL, term);
+-  for (i = 0; i < geo->entry_width + 1; i++)
+-    grub_putcode (GRUB_UNICODE_HLINE, term);
+-  grub_putcode (GRUB_UNICODE_CORNER_UR, term);
+-
+-  for (i = 0; i < geo->num_entries; i++)
+-    {
+-      grub_term_gotoxy (term, (struct grub_term_coordinate) { geo->first_entry_x - 1,
+-	    geo->first_entry_y + i });
+-      grub_putcode (GRUB_UNICODE_VLINE, term);
+-      grub_term_gotoxy (term,
+-			(struct grub_term_coordinate) { geo->first_entry_x + geo->entry_width + 1,
+-			    geo->first_entry_y + i });
+-      grub_putcode (GRUB_UNICODE_VLINE, term);
+-    }
+-
+-  grub_term_gotoxy (term,
+-		    (struct grub_term_coordinate) { geo->first_entry_x - 1,
+-			geo->first_entry_y - 1 + geo->num_entries + 1 });
+-  grub_putcode (GRUB_UNICODE_CORNER_LL, term);
+-  for (i = 0; i < geo->entry_width + 1; i++)
+-    grub_putcode (GRUB_UNICODE_HLINE, term);
+-  grub_putcode (GRUB_UNICODE_CORNER_LR, term);
+-
+-  grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
+-
+-  grub_term_gotoxy (term,
+-		    (struct grub_term_coordinate) { geo->first_entry_x - 1,
+-			(geo->first_entry_y - 1 + geo->num_entries
+-			 + GRUB_TERM_MARGIN + 1) });
+-}
+-
+ static int
+ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
+ {
+@@ -406,8 +365,6 @@ grub_menu_init_page (int nested, int edit,
+ 
+   grub_term_normal_color = grub_color_menu_normal;
+   grub_term_highlight_color = grub_color_menu_highlight;
+-  if (geo->border)
+-    draw_border (term, geo);
+   grub_term_normal_color = old_color_normal;
+   grub_term_highlight_color = old_color_highlight;
+   geo->timeout_y = geo->first_entry_y + geo->num_entries

0042-Use-the-standard-margin-for-the-timeout-string.patch

@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <william.jon.mccann@gmail.com>
+Date: Fri, 7 Jun 2013 10:52:32 -0400
+Subject: [PATCH] Use the standard margin for the timeout string
+
+So that it aligns with the other messages
+---
+ grub-core/normal/menu_text.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
+index 1ed2bd92cf8..7681f7d2893 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,
+   if (bottom_message)
+     {
+       grub_term_gotoxy (term,
+-			(struct grub_term_coordinate) { GRUB_TERM_MARGIN,
++			(struct grub_term_coordinate) { STANDARD_MARGIN,
+ 			    geo->timeout_y });
+ 
+       print_message (nested, edit, term, 0);
+@@ -407,14 +407,14 @@ menu_text_print_timeout (int timeout, void *dataptr)
+   if (data->timeout_msg == TIMEOUT_UNKNOWN)
+     {
+       data->timeout_msg = grub_print_message_indented_real (msg_translated,
+-							    3, 1, data->term, 1)
++							    STANDARD_MARGIN, 1, data->term, 1)
+ 	<= data->geo.timeout_lines ? TIMEOUT_NORMAL : TIMEOUT_TERSE;
+       if (data->timeout_msg == TIMEOUT_TERSE)
+ 	{
+ 	  grub_free (msg_translated);
+ 	  msg_translated = grub_xasprintf (_("%ds"), timeout);
+ 	  if (grub_term_width (data->term) < 10)
+-	    data->timeout_msg = TIMEOUT_TERSE_NO_MARGIN;
++	    data->timeout_msg = STANDARD_MARGIN;
+ 	}
+     }
+ 

0043-Add-.eh_frame-to-list-of-relocations-stripped.patch

@@ -3,21 +3,20 @@ From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Mon, 13 Jan 2014 21:50:59 -0500
 Subject: [PATCH] Add .eh_frame to list of relocations stripped
 
-Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  conf/Makefile.common | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/conf/Makefile.common b/conf/Makefile.common
-index b8f216f6cd3..ece9ed8a1bf 100644
+index 6cd71cbb2ab..4ba729e14d8 100644
 --- a/conf/Makefile.common
 +++ b/conf/Makefile.common
-@@ -41,7 +41,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
+@@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
  LDFLAGS_KERNEL = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC)
  CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
  CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
 -STRIPFLAGS_KERNEL = -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx
 +STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx
- if !COND_emu
- if COND_HAVE_ASM_USCORE
-   LDFLAGS_KERNEL += -Wl,--defsym=_malloc=_grub_malloc -Wl,--defsym=_free=_grub_free
+ 
+ CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding
+ LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d

0044-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch

@@ -0,0 +1,33 @@
+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 e0fb0a9e48a..8e2294d8ff6 100644
+--- a/grub-core/lib/cmdline.c
++++ b/grub-core/lib/cmdline.c
+@@ -98,16 +98,7 @@ 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++;

0045-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 901745707f1..9c31a94decb 100644
+index 2b402d85a52..d35b0f406bc 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -26,7 +26,7 @@ datarootdir="@datarootdir@"

0046-Don-t-emit-Booting-.-message.patch

@@ -0,0 +1,49 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 18 Feb 2014 09:37:49 -0500
+Subject: [PATCH] Don't emit "Booting ..." message.
+
+UI team still hates this stuff, so we're disabling it for RHEL 7.
+
+Resolves: rhbz#1023142
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/normal/menu.c       | 4 +++-
+ grub-core/normal/menu_entry.c | 3 ---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
+index 9175ad297d8..783bde55b9e 100644
+--- a/grub-core/normal/menu.c
++++ b/grub-core/normal/menu.c
+@@ -839,12 +839,14 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
+ 
+ /* Callback invoked immediately before a menu entry is executed.  */
+ static void
+-notify_booting (grub_menu_entry_t entry,
++notify_booting (grub_menu_entry_t __attribute__((unused)) entry,
+ 		void *userdata __attribute__((unused)))
+ {
++#if 0
+   grub_printf ("  ");
+   grub_printf_ (N_("Booting `%s'"), entry->title);
+   grub_printf ("\n\n");
++#endif
+ }
+ 
+ /* 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 cdf3590a364..5785f67ee1c 100644
+--- a/grub-core/normal/menu_entry.c
++++ b/grub-core/normal/menu_entry.c
+@@ -1167,9 +1167,6 @@ run (struct screen *screen)
+   char *dummy[1] = { NULL };
+ 
+   grub_cls ();
+-  grub_printf ("  ");
+-  grub_printf_ (N_("Booting a command list"));
+-  grub_printf ("\n\n");
+ 
+   errs_before = grub_err_printed_errors;
+ 

0046-Use-grub_efi_.-memory-helpers-where-reasonable.patch

@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 1 Jun 2017 10:06:38 -0400
-Subject: [PATCH] Use grub_efi_...() memory helpers where reasonable.
-
-This uses grub_efi_allocate_pool(), grub_efi_free_pool(), and
-grub_efi_free_pages() instead of open-coded efi_call_N() calls, so we
-get more reasonable type checking.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/loader/efi/chainloader.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 1de98f78313..2036924504b 100644
---- a/grub-core/loader/efi/chainloader.c
-+++ b/grub-core/loader/efi/chainloader.c
-@@ -95,7 +95,7 @@ grub_chainloader_boot (void *context)
-     }
- 
-   if (exit_data)
--    b->free_pool (exit_data);
-+    grub_efi_free_pool (exit_data);
- 
-   grub_loader_unset ();
- 
-@@ -419,7 +419,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
-   grub_free (file_path);
- 
-   if (address)
--    b->free_pages (address, pages);
-+    grub_efi_free_pages (address, pages);
- 
-   if (image_handle != NULL)
-     b->unload_image (image_handle);

0047-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch

@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 1 Jun 2017 10:07:50 -0400
-Subject: [PATCH] Add PRIxGRUB_EFI_STATUS and use it.
-
-This avoids syntax checkers getting confused about if it's llx or lx.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- include/grub/efi/api.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index c1b869db520..daa9268fdaa 100644
---- a/include/grub/efi/api.h
-+++ b/include/grub/efi/api.h
-@@ -577,7 +577,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_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"
-+#define PRIdGRUB_EFI_STATUS "ld"
-+#else
-+#define PRIxGRUB_EFI_STATUS "llx"
-+#define PRIdGRUB_EFI_STATUS "lld"
-+#endif
- 
- /*
-  * On x86, the EFI calling convention may deviate from the local one, so

0048-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 568c2adfa16..0b2bbee19c3 100644
+index 7f61c5b618b..8add30e605f 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -347,7 +347,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 568c2adfa16..0b2bbee19c3 100644
        if (fw_path)
  	{
  	  config = grub_xasprintf ("%s/grub.cfg", fw_path);
-@@ -370,7 +370,8 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
+@@ -372,7 +372,8 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
  	    }
  	}
  

0049-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch

@@ -5,14 +5,14 @@ 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(-)
+ grub-core/normal/main.c | 84 ++++++++++++++++++++++++++-----------------------
+ 1 file changed, 45 insertions(+), 39 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 0b2bbee19c3..4c89892fa70 100644
+index 8add30e605f..d93bee613ac 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -345,61 +345,66 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
+@@ -347,53 +347,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;
@@ -41,39 +41,25 @@ index 0b2bbee19c3..4c89892fa70 100644
 -	    }
 -	}
 +      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");
+-                      sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
 -          config = grub_malloc (config_len);
 -
--          if (!config)
+-          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);
+           if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0)
+-            grub_net_search_configfile (config);
 +            {
 +              grub_size_t config_len;
 +              config_len = grub_strlen (prefix) +

0050-Fix-convert-function-to-support-NVMe-devices.patch

@@ -0,0 +1,56 @@
+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 847406fbab0..fa3460d6cd8 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);
+ 

0051-Add-grub_util_readlink.patch

@@ -0,0 +1,82 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 8 Jul 2019 21:46:52 +0200
+Subject: [PATCH] Add grub_util_readlink()
+
+Add grub_util_readlink().  This requires pulling in stat and readlink from
+gnulib, which pulls in stat and related headers, but after that the
+implementation is straightforward.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+Reviewed-by: Adam Jackson <ajax@redhat.com>
+---
+ grub-core/osdep/windows/hostdisk.c    | 6 ++++++
+ include/grub/osdep/hostfile_aros.h    | 6 ++++++
+ include/grub/osdep/hostfile_unix.h    | 6 ++++++
+ include/grub/osdep/hostfile_windows.h | 2 ++
+ 4 files changed, 20 insertions(+)
+
+diff --git a/grub-core/osdep/windows/hostdisk.c b/grub-core/osdep/windows/hostdisk.c
+index 355100789a7..87a106c9b82 100644
+--- a/grub-core/osdep/windows/hostdisk.c
++++ b/grub-core/osdep/windows/hostdisk.c
+@@ -365,6 +365,12 @@ grub_util_mkdir (const char *dir)
+   free (windows_name);
+ }
+ 
++ssize_t
++grub_util_readlink (const char *name, char *buf, size_t bufsize)
++{
++  return readlink(name, buf, bufsize);
++}
++
+ int
+ grub_util_rename (const char *from, const char *to)
+ {
+diff --git a/include/grub/osdep/hostfile_aros.h b/include/grub/osdep/hostfile_aros.h
+index a059c0fa40a..161fbb7bdfd 100644
+--- a/include/grub/osdep/hostfile_aros.h
++++ b/include/grub/osdep/hostfile_aros.h
+@@ -68,6 +68,12 @@ grub_util_rename (const char *from, const char *to)
+   return rename (from, to);
+ }
+ 
++static inline ssize_t
++grub_util_readlink (const char *name, char *buf, size_t bufsize)
++{
++  return readlink(name, buf, bufsize);
++}
++
+ #define grub_util_mkdir(a) mkdir ((a), 0755)
+ 
+ struct grub_util_fd
+diff --git a/include/grub/osdep/hostfile_unix.h b/include/grub/osdep/hostfile_unix.h
+index 9ffe46fa3ca..17cd3aa8b30 100644
+--- a/include/grub/osdep/hostfile_unix.h
++++ b/include/grub/osdep/hostfile_unix.h
+@@ -71,6 +71,12 @@ grub_util_rename (const char *from, const char *to)
+   return rename (from, to);
+ }
+ 
++static inline ssize_t
++grub_util_readlink (const char *name, char *buf, size_t bufsize)
++{
++  return readlink(name, buf, bufsize);
++}
++
+ #define grub_util_mkdir(a) mkdir ((a), 0755)
+ 
+ #if defined (__NetBSD__)
+diff --git a/include/grub/osdep/hostfile_windows.h b/include/grub/osdep/hostfile_windows.h
+index bf6451b6db4..8c92d0591bb 100644
+--- a/include/grub/osdep/hostfile_windows.h
++++ b/include/grub/osdep/hostfile_windows.h
+@@ -41,6 +41,8 @@ typedef struct grub_util_fd_dir *grub_util_fd_dir_t;
+ 
+ int
+ grub_util_rename (const char *from, const char *to);
++ssize_t
++grub_util_readlink (const char *name, char *buf, size_t bufsize);
+ int
+ grub_util_unlink (const char *name);
+ void

0052-Make-editenv-chase-symlinks-including-those-across-d.patch

@@ -0,0 +1,104 @@
+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 | 11 +++++++++++
+ util/editenv.c    | 46 ++++++++++++++++++++++++++++++++++++++++++++--
+ 2 files changed, 55 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.util.def b/Makefile.util.def
+index 8717774d510..1f298d05f3d 100644
+--- a/Makefile.util.def
++++ b/Makefile.util.def
+@@ -240,8 +240,19 @@ 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 = util/grub-mkimage32.c;
++  common = util/grub-mkimage64.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 eb2d0c03a98..e61dc1283a4 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);
+ 
+@@ -60,7 +61,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);
+ }

0053-Add-BLS-support-to-grub-mkconfig.patch

@@ -1,382 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Fri, 9 Dec 2016 15:40:29 -0500
-Subject: [PATCH] Add BLS support to grub-mkconfig
-
-GRUB now has BootLoaderSpec support, the user can choose to use this by
-setting GRUB_ENABLE_BLSCFG to true in /etc/default/grub. On this setup,
-the boot menu entries are not added to the grub.cfg, instead BLS config
-files are parsed by blscfg command and the entries created dynamically.
-
-A 10_linux_bls grub.d snippet to generate menu entries from BLS files
-is also added that can be used on platforms where the bootloader doesn't
-have BLS support and only can parse a normal grub configuration file.
-
-Portions of the 10_linux_bls were taken from the ostree-grub-generator
-script that's included in the OSTree project.
-
-Fixes to support multi-devices and generate a BLS section even if no
-kernels are found in the boot directory were proposed by Yclept Nemo
-and Tom Gundersen respectively.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
-[javierm: remove outdated URL for BLS document]
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
-[iwienand@redhat.com: skip machine ID check when updating entries]
-Signed-off-by: Ian Wienand <iwienand@redhat.com>
-[rharwood: use sort(1), commit message composits, drop man pages]
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
----
- util/grub-mkconfig.in     |   9 +-
- util/grub-mkconfig_lib.in |  22 ++++-
- util/grub.d/10_linux.in   | 218 +++++++++++++++++++++++++++++++++++++++++++++-
- 3 files changed, 243 insertions(+), 6 deletions(-)
-
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 884e4d363ca..bec52e052fc 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -50,6 +50,8 @@ grub_get_kernel_settings="${sbindir}/@grub_get_kernel_settings@"
- export TEXTDOMAIN=@PACKAGE@
- export TEXTDOMAINDIR="@localedir@"
- 
-+export GRUB_GRUBENV_UPDATE="yes"
-+
- . "${pkgdatadir}/grub-mkconfig_lib"
- 
- # Usage: usage
-@@ -59,6 +61,7 @@ usage () {
-     gettext "Generate a grub config file"; echo
-     echo
-     print_option_help "-o, --output=$(gettext FILE)" "$(gettext "output generated config to FILE [default=stdout]")"
-+    print_option_help "--no-grubenv-update" "$(gettext "do not update variables in the grubenv file")"
-     print_option_help "-h, --help" "$(gettext "print this message and exit")"
-     print_option_help "-V, --version" "$(gettext "print the version information and exit")"
-     echo
-@@ -94,6 +97,9 @@ do
-     --output=*)
- 	grub_cfg=`echo "$option" | sed 's/--output=//'`
- 	;;
-+    --no-grubenv-update)
-+	GRUB_GRUBENV_UPDATE="no"
-+	;;
-     -*)
- 	gettext_printf "Unrecognized option \`%s'\n" "$option" 1>&2
- 	usage
-@@ -257,7 +263,8 @@ export GRUB_DEFAULT \
-   GRUB_OS_PROBER_SKIP_LIST \
-   GRUB_DISABLE_SUBMENU \
-   GRUB_DEFAULT_DTB \
--  SUSE_BTRFS_SNAPSHOT_BOOTING
-+  SUSE_BTRFS_SNAPSHOT_BOOTING \
-+  GRUB_ENABLE_BLSCFG
- 
- 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 0ba0e0e1c65..c2e107b41ab 100644
---- a/util/grub-mkconfig_lib.in
-+++ b/util/grub-mkconfig_lib.in
-@@ -30,6 +30,9 @@ fi
- if test "x$grub_file" = x; then
-   grub_file="${bindir}/@grub_file@"
- fi
-+if test "x$grub_editenv" = x; then
-+  grub_editenv="${bindir}/@grub_editenv@"
-+fi
- if test "x$grub_mkrelpath" = x; then
-   grub_mkrelpath="${bindir}/@grub_mkrelpath@"
- fi
-@@ -122,8 +125,19 @@ EOF
-   fi
- }
- 
-+prepare_grub_to_access_device_with_variable ()
-+{
-+  device_variable="$1"
-+  shift
-+  prepare_grub_to_access_device "$@"
-+  unset "device_variable"
-+}
-+
- prepare_grub_to_access_device ()
- {
-+  if [ -z "$device_variable" ]; then
-+    device_variable="root"
-+  fi
-   old_ifs="$IFS"
-   IFS='
- '
-@@ -158,18 +172,18 @@ prepare_grub_to_access_device ()
-   # otherwise set root as per value in device.map.
-   fs_hint="`"${grub_probe}" --device $@ --target=compatibility_hint`"
-   if [ "x$fs_hint" != x ]; then
--    echo "set root='$fs_hint'"
-+    echo "set ${device_variable}='$fs_hint'"
-   fi
-   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=
-     if [ "x$hints" != x ]; then
-       echo "if [ x\$feature_platform_search_hint = xy ]; then"
--      echo "  search --no-floppy --fs-uuid --set=root ${hints} ${fs_uuid}"
-+      echo "  search --no-floppy --fs-uuid --set=${device_variable} ${hints} ${fs_uuid}"
-       echo "else"
--      echo "  search --no-floppy --fs-uuid --set=root ${fs_uuid}"
-+      echo "  search --no-floppy --fs-uuid --set=${device_variable} ${fs_uuid}"
-       echo "fi"
-     else
--      echo "search --no-floppy --fs-uuid --set=root ${fs_uuid}"
-+      echo "search --no-floppy --fs-uuid --set=${device_variable} ${fs_uuid}"
-     fi
-   fi
-   IFS="$old_ifs"
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 48ff32c1da4..cd9aea0cc01 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -84,6 +84,218 @@ case x"$GRUB_FS" in
- 	;;
- esac
- 
-+populate_header_warn()
-+{
-+if [ "x${BLS_POPULATE_MENU}" = "xtrue" ]; then
-+  bls_parser="10_linux script"
-+else
-+  bls_parser="blscfg command"
-+fi
-+cat <<EOF
-+
-+# This section was generated by a script. Do not modify the generated file - all changes
-+# will be lost the next time file is regenerated. Instead edit the BootLoaderSpec files.
-+#
-+# The $bls_parser parses the BootLoaderSpec files stored in /boot/loader/entries and
-+# populates the boot menu. Please refer to the Boot Loader Specification documentation
-+# for the files format: https://systemd.io/BOOT_LOADER_SPECIFICATION/.
-+
-+EOF
-+}
-+
-+read_config()
-+{
-+    config_file=${1}
-+    title=""
-+    initrd=""
-+    options=""
-+    linux=""
-+    grub_arg=""
-+
-+    while read -r line
-+    do
-+        record=$(echo ${line} | cut -f 1 -d ' ')
-+        value=$(echo ${line} | cut -s -f2- -d ' ')
-+        case "${record}" in
-+            "title")
-+                title=${value}
-+                ;;
-+            "initrd")
-+                initrd=${value}
-+                ;;
-+            "linux")
-+                linux=${value}
-+                ;;
-+            "options")
-+                options=${value}
-+                ;;
-+            "grub_arg")
-+                grub_arg=${value}
-+                ;;
-+        esac
-+    done < ${config_file}
-+}
-+
-+blsdir="/boot/loader/entries"
-+
-+get_sorted_bls()
-+{
-+    if ! [ -d "${blsdir}" ]; then
-+        return
-+    fi
-+
-+    local IFS=$'\n'
-+
-+    files=($(for bls in ${blsdir}/*.conf; do
-+        if ! [[ -e "${bls}" ]] ; then
-+            continue
-+        fi
-+        bls="${bls%.conf}"
-+        bls="${bls##*/}"
-+        echo "${bls}"
-+    done | sort -Vr 2>/dev/null)) || :
-+
-+    echo "${files[@]}"
-+}
-+
-+update_bls_cmdline()
-+{
-+    local cmdline="root=${LINUX_ROOT_DEVICE} ro ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+    local -a files=($(get_sorted_bls))
-+
-+    for bls in "${files[@]}"; do
-+        local options="${cmdline}"
-+        if [ -z "${bls##*debug*}" ]; then
-+            options="${options} ${GRUB_CMDLINE_LINUX_DEBUG}"
-+        fi
-+        options="$(echo "${options}" | sed -e 's/\//\\\//g')"
-+        sed -i -e "s/^options.*/options ${options}/" "${blsdir}/${bls}.conf"
-+    done
-+}
-+
-+populate_menu()
-+{
-+    local -a files=($(get_sorted_bls))
-+
-+    gettext_printf "Generating boot entries from BLS files...\n" >&2
-+
-+    for bls in "${files[@]}"; do
-+        read_config "${blsdir}/${bls}.conf"
-+
-+        menu="${menu}menuentry '${title}' ${grub_arg} --id=${bls} {\n"
-+        menu="${menu}\t linux ${linux} ${options}\n"
-+        if [ -n "${initrd}" ] ; then
-+            menu="${menu}\t initrd ${boot_prefix}${initrd}\n"
-+        fi
-+        menu="${menu}}\n\n"
-+    done
-+    # The printf command seems to be more reliable across shells for special character (\n, \t) evaluation
-+    printf "$menu"
-+}
-+
-+# Make BLS the default if GRUB_ENABLE_BLSCFG was not set and grubby is not installed.
-+if [ -z "${GRUB_ENABLE_BLSCFG}" ] && ! command -v new-kernel-pkg >/dev/null; then
-+	  GRUB_ENABLE_BLSCFG="true"
-+fi
-+
-+if [ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ]; then
-+  if [ x$dirname = x/ ]; then
-+    if [ -z "${prepare_root_cache}" ]; then
-+      prepare_grub_to_access_device ${GRUB_DEVICE}
-+    fi
-+  else
-+    if [ -z "${prepare_boot_cache}" ]; then
-+      prepare_grub_to_access_device ${GRUB_DEVICE_BOOT}
-+    fi
-+  fi
-+
-+  if [ -d /sys/firmware/efi ]; then
-+      bootefi_device="`${grub_probe} --target=device /boot/efi/`"
-+      prepare_grub_to_access_device_with_variable boot ${bootefi_device}
-+  else
-+      boot_device="`${grub_probe} --target=device /boot/`"
-+      prepare_grub_to_access_device_with_variable boot ${boot_device}
-+  fi
-+
-+  arch="$(uname -m)"
-+  if [ "x${arch}" = "xppc64le" ] && [ -d /sys/firmware/opal ]; then
-+
-+      BLS_POPULATE_MENU="true"
-+      petitboot_path="/sys/firmware/devicetree/base/ibm,firmware-versions/petitboot"
-+
-+      if test -e ${petitboot_path}; then
-+          read -r -d '' petitboot_version < ${petitboot_path}
-+          petitboot_version="$(echo ${petitboot_version//v})"
-+
-+	  if test -n ${petitboot_version}; then
-+              major_version="$(echo ${petitboot_version} | cut -d . -f1)"
-+              minor_version="$(echo ${petitboot_version} | cut -d . -f2)"
-+
-+              re='^[0-9]+$'
-+              if [[ $major_version =~ $re ]] && [[ $minor_version =~ $re ]] &&
-+                 ([[ ${major_version} -gt 1 ]] ||
-+                  [[ ${major_version} -eq 1 &&
-+                     ${minor_version} -ge 8  ]]); then
-+                  BLS_POPULATE_MENU="false"
-+              fi
-+          fi
-+      fi
-+  fi
-+
-+  populate_header_warn
-+
-+  cat << EOF
-+# The kernelopts variable should be defined in the grubenv file. But to ensure that menu
-+# entries populated from BootLoaderSpec files that use this variable work correctly even
-+# without a grubenv file, define a fallback kernelopts variable if this has not been set.
-+#
-+# The kernelopts variable in the grubenv file can be modified using the grubby tool or by
-+# executing the grub2-mkconfig tool. For the latter, the values of the GRUB_CMDLINE_LINUX
-+# and GRUB_CMDLINE_LINUX_DEFAULT options from /etc/default/grub file are used to set both
-+# the kernelopts variable in the grubenv file and the fallback kernelopts variable.
-+if [ -z "\${kernelopts}" ]; then
-+  set kernelopts="root=${LINUX_ROOT_DEVICE} ro ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+fi
-+EOF
-+
-+  update_bls_cmdline
-+
-+  if [ "x${BLS_POPULATE_MENU}" = "xtrue" ]; then
-+      populate_menu
-+  else
-+      cat << EOF
-+
-+insmod blscfg
-+blscfg
-+EOF
-+  fi
-+
-+  if [ "x${GRUB_GRUBENV_UPDATE}" = "xyes" ]; then
-+      blsdir="/boot/loader/entries"
-+      [ -d "${blsdir}" ] && GRUB_BLS_FS="$(${grub_probe} --target=fs ${blsdir})"
-+      if [ "x${GRUB_BLS_FS}" = "xbtrfs" ] || [ "x${GRUB_BLS_FS}" = "xzfs" ]; then
-+          blsdir=$(make_system_path_relative_to_its_root "${blsdir}")
-+          if [ "x${blsdir}" != "x/loader/entries" ] && [ "x${blsdir}" != "x/boot/loader/entries" ]; then
-+              ${grub_editenv} - set blsdir="${blsdir}"
-+          fi
-+      fi
-+
-+      if [ -n "${GRUB_EARLY_INITRD_LINUX_CUSTOM}" ]; then
-+          ${grub_editenv} - set early_initrd="${GRUB_EARLY_INITRD_LINUX_CUSTOM}"
-+      fi
-+
-+      if [ -n "${GRUB_DEFAULT_DTB}" ]; then
-+          ${grub_editenv} - set devicetree="${GRUB_DEFAULT_DTB}"
-+      fi
-+
-+      if [ -n "${GRUB_SAVEDEFAULT}" ]; then
-+           ${grub_editenv} - set save_default="${GRUB_SAVEDEFAULT}"
-+      fi
-+  fi
-+
-+  exit 0
-+fi
-+
- mktitle ()
- {
-   local title_type
-@@ -123,6 +335,7 @@ linux_entry ()
-   if [ -z "$boot_device_id" ]; then
-       boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
-   fi
-+
-   if [ x$type != xsimple ] ; then
-       title=$(mktitle "$type" "$version")
-       if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
-@@ -243,6 +456,7 @@ fi
- is_top_level=true
- for linux in ${reverse_sorted_list}; do
-   gettext_printf "Found linux image: %s\n" "$linux" >&2
-+
-   basename=`basename $linux`
-   dirname=`dirname $linux`
-   rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -283,7 +497,9 @@ for linux in ${reverse_sorted_list}; do
-     for i in ${initrd}; do
-       initrd_display="${initrd_display} ${dirname}/${i}"
-     done
--    gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
-+    if [ "x${GRUB_ENABLE_BLSCFG}" != "xtrue" ]; then
-+      gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
-+    fi
-   fi
- 
-   fdt=

0053-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 9c31a94decb..b7809091b36 100644
+index d35b0f406bc..d12d2d784dc 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@"

0054-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 c2e107b41ab..4eadcba4b85 100644
+index 1001a12232b..1a4a57898f9 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
-@@ -299,6 +299,14 @@ version_test_gt ()
+@@ -249,6 +249,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 ;;

0055-Try-prefix-if-fw_path-doesn-t-work.patch

@@ -7,26 +7,38 @@ Related: rhbz#1148652
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- grub-core/kern/ieee1275/init.c |  34 ++++++-----
+ grub-core/kern/ieee1275/init.c |  28 +++++-----
  grub-core/net/net.c            |   2 +-
- grub-core/normal/main.c        | 134 ++++++++++++++++++++---------------------
- 3 files changed, 85 insertions(+), 85 deletions(-)
+ grub-core/normal/main.c        | 120 ++++++++++++++++++++---------------------
+ 3 files changed, 75 insertions(+), 75 deletions(-)
 
 diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index 50c65b2f6e5..51c1e1c9d9f 100644
+index e71d1584164..0cd2a627231 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
-@@ -170,23 +170,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
 -    *device = grub_ieee1275_encode_devname (bootpath);
-+    {
+-  grub_free (type);
+-
+-  filename = grub_ieee1275_get_filename (bootpath);
+-  if (filename)
+     {
+-      char *lastslash = grub_strrchr (filename, '\\');
+-
+-      /* Truncate at last directory.  */
+-      if (lastslash)
 +      filename = grub_ieee1275_get_filename (bootpath);
 +      if (filename)
-+        {
+         {
+-	  *lastslash = '\0';
+-	  grub_translate_ieee1275_path (filename);
 +          char *lastslash = grub_strrchr (filename, '\\');
-+
+ 
+-	  *path = filename;
+-	}
 +          /* Truncate at last directory.  */
 +          if (lastslash)
 +            {
@@ -37,32 +49,17 @@ index 50c65b2f6e5..51c1e1c9d9f 100644
 +            }
 +        }
 +      *device = grub_ieee1275_encode_devname (bootpath);
-+    }
+     }
 +
-   grub_free (type);
--
--  filename = grub_ieee1275_get_filename (bootpath);
--  if (filename)
--    {
--      char *lastslash = grub_strrchr (filename, '\\');
--
--      /* Truncate at last directory.  */
--      if (lastslash)
--        {
--	  *lastslash = '\0';
--	  grub_translate_ieee1275_path (filename);
--
--	  *path = filename;
--	}
--    }
++  grub_free (type);
    grub_free (bootpath);
  }
  
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 8cad4fb6d4d..54451cea2a7 100644
+index 06454564b8f..4b7972b8e7e 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
-@@ -2005,7 +2005,7 @@ grub_net_search_config_file (char *config)
+@@ -1850,7 +1850,7 @@ grub_net_search_configfile (char *config)
    /* Remove the remaining minus sign at the end. */
    config[config_len] = '\0';
  
@@ -72,10 +69,10 @@ index 8cad4fb6d4d..54451cea2a7 100644
  
  static struct grub_preboot *fini_hnd;
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 4c89892fa70..3463f444f74 100644
+index d93bee613ac..2fe6743399d 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -335,81 +335,79 @@ grub_enter_normal_mode (const char *config)
+@@ -337,74 +337,72 @@ grub_enter_normal_mode (const char *config)
    grub_boot_time ("Exiting normal mode");
  }
  
@@ -85,19 +82,12 @@ index 4c89892fa70..3463f444f74 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;
 +
-+    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)
++    if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0)
 +      {
 +       grub_size_t config_len;
 +       config_len = grub_strlen (prefix) +
@@ -108,7 +98,7 @@ index 4c89892fa70..3463f444f74 100644
 +         return GRUB_ERR_FILE_NOT_FOUND;
 +
 +       grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
-+       err = grub_net_search_config_file (config);
++       err = grub_net_search_configfile (config);
 +      }
 +
 +    if (err != GRUB_ERR_NONE)
@@ -145,21 +135,14 @@ index 4c89892fa70..3463f444f74 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 &&
--              !disable_net_search)
+-          if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0)
 -            {
 -              grub_size_t config_len;
 -              config_len = grub_strlen (prefix) +

0056-Update-info-with-grub.cfg-netboot-selection-order-11.patch

@@ -0,0 +1,66 @@
+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 6f524305085..221064b5679 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.
+ 

0057-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch

@@ -0,0 +1,447 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Robert Marshall <rmarshall@redhat.com>
+Date: Mon, 16 Mar 2015 14:14:19 -0400
+Subject: [PATCH] Use Distribution Package Sort for grub2-mkconfig (#1124074)
+
+Users reported that newly installed kernels on their systems installed
+with grub-mkconfig would not appear on the grub boot list in order
+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>
+---
+ configure.ac              |  29 +++++
+ Makefile.util.def         |  16 +++
+ util/grub-rpm-sort.c      | 281 ++++++++++++++++++++++++++++++++++++++++++++++
+ util/grub-mkconfig_lib.in |  11 +-
+ util/grub-rpm-sort.8      |  12 ++
+ 5 files changed, 348 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 8df400e0a8b..6927615819b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -69,6 +69,7 @@ grub_TRANSFORM([grub-mkrelpath])
+ grub_TRANSFORM([grub-mkrescue])
+ grub_TRANSFORM([grub-probe])
+ grub_TRANSFORM([grub-reboot])
++grub_TRANSFORM([grub-rpm-sort])
+ grub_TRANSFORM([grub-script-check])
+ grub_TRANSFORM([grub-set-default])
+ grub_TRANSFORM([grub-sparc64-setup])
+@@ -92,6 +93,7 @@ grub_TRANSFORM([grub-mkrescue.1])
+ grub_TRANSFORM([grub-mkstandalone.3])
+ grub_TRANSFORM([grub-ofpathname.3])
+ grub_TRANSFORM([grub-probe.3])
++grub_TRANSFORM([grub-rpm-sort.8])
+ grub_TRANSFORM([grub-reboot.3])
+ grub_TRANSFORM([grub-render-label.3])
+ grub_TRANSFORM([grub-script-check.3])
+@@ -1802,6 +1804,33 @@ 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
++  rpm_sort_excuse="explicitly disabled"
++fi
++
++if test x"$rpm_sort_excuse" = x ; then
++  # Check for rpmlib header.
++  AC_CHECK_HEADER([rpm/rpmlib.h], [],
++               [rpm_sort_excuse="need rpm/rpmlib header"])
++fi
++
++if test x"$rpm_sort_excuse" = x ; then
++  # Check for rpm library.
++  AC_CHECK_LIB([rpm], [rpmvercmp], [],
++               [rpm_sort_excuse="rpmlib missing rpmvercmp"])
++fi
++
++if test x"$rpm_sort_excuse" = x ; then
++   LIBRPM="-lrpm";
++   AC_DEFINE([HAVE_RPM], [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 1f298d05f3d..843ce092b94 100644
+--- a/Makefile.util.def
++++ b/Makefile.util.def
+@@ -696,6 +696,22 @@ program = {
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+ };
+ 
++program = {
++  name = grub-rpm-sort;
++  mansection = 8;
++  installdir = sbin;
++
++  common = grub-core/kern/emu/misc.c;
++  common = grub-core/kern/emu/argp_common.c;
++  common = grub-core/osdep/init.c;
++  common = util/misc.c;
++  common = util/grub-rpm-sort.c;
++
++  ldadd = libgrubkern.a;
++  ldadd = grub-core/lib/gnulib/libgnu.a;
++  ldadd = '$(LIBDEVMAPPER) $(LIBRPM)';
++};
++
+ script = {
+   name = grub-mkconfig;
+   common = util/grub-mkconfig.in;
+diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c
+new file mode 100644
+index 00000000000..f33bd1ed568
+--- /dev/null
++++ b/util/grub-rpm-sort.c
+@@ -0,0 +1,281 @@
++#include <config.h>
++#include <grub/types.h>
++#include <grub/util/misc.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <errno.h>
++#include <assert.h>
++#include <argp.h>
++#include <rpm/rpmlib.h>
++
++static size_t
++read_file (const char *input, char **ret)
++{
++  FILE *in;
++  size_t s;
++  size_t sz = 2048;
++  size_t offset = 0;
++  char *text;
++
++  if (!strcmp(input, "-"))
++    in = stdin;
++  else
++    in = grub_util_fopen(input, "r");
++
++  text = xmalloc (sz);
++
++  if (!in)
++    grub_util_error (_("cannot open `%s': %s"), input, strerror (errno));
++
++  while ((s = fread (text + offset, 1, sz - offset, in)) != 0)
++    {
++      offset += s;
++      if (sz - offset == 0)
++	{
++	  sz += 2048;
++	  text = xrealloc (text, sz);
++	}
++    }
++
++  text[offset] = '\0';
++  *ret = text;
++
++  if (in != stdin)
++    fclose(in);
++
++  return offset + 1;
++}
++
++/* returns name/version/release */
++/* NULL string pointer returned if nothing found */
++static void
++split_package_string (char *package_string, char **name,
++                     char **version, char **release)
++{
++  char *package_version, *package_release;
++
++  /* Release */
++  package_release = strrchr (package_string, '-');
++
++  if (package_release != NULL)
++      *package_release++ = '\0';
++
++  *release = package_release;
++
++  /* Version */
++  package_version = strrchr(package_string, '-');
++
++  if (package_version != NULL)
++      *package_version++ = '\0';
++
++  *version = package_version;
++  /* Name */
++  *name = package_string;
++
++  /* Bubble up non-null values from release to name */
++  if (*name == NULL)
++    {
++      *name = (*version == NULL ? *release : *version);
++      *version = *release;
++      *release = NULL;
++    }
++  if (*version == NULL)
++    {
++      *version = *release;
++      *release = NULL;
++    }
++}
++
++/*
++ * package name-version-release comparator for qsort
++ * expects p, q which are pointers to character strings (char *)
++ * which will not be altered in this function
++ */
++static int
++package_version_compare (const void *p, const void *q)
++{
++  char *local_p, *local_q;
++  char *lhs_name, *lhs_version, *lhs_release;
++  char *rhs_name, *rhs_version, *rhs_release;
++  int vercmpflag = 0;
++
++  local_p = alloca (strlen (*(char * const *)p) + 1);
++  local_q = alloca (strlen (*(char * const *)q) + 1);
++
++  /* make sure these allocated */
++  assert (local_p);
++  assert (local_q);
++
++  strcpy (local_p, *(char * const *)p);
++  strcpy (local_q, *(char * const *)q);
++
++  split_package_string (local_p, &lhs_name, &lhs_version, &lhs_release);
++  split_package_string (local_q, &rhs_name, &rhs_version, &rhs_release);
++
++  /* Check Name and return if unequal */
++  vercmpflag = rpmvercmp ((lhs_name == NULL ? "" : lhs_name),
++                          (rhs_name == NULL ? "" : rhs_name));
++  if (vercmpflag != 0)
++    return vercmpflag;
++
++  /* Check version and return if unequal */
++  vercmpflag = rpmvercmp ((lhs_version == NULL ? "" : lhs_version),
++                          (rhs_version == NULL ? "" : rhs_version));
++  if (vercmpflag != 0)
++    return vercmpflag;
++
++  /* Check release and return the version compare value */
++  vercmpflag = rpmvercmp ((lhs_release == NULL ? "" : lhs_release),
++                          (rhs_release == NULL ? "" : rhs_release));
++
++  return vercmpflag;
++}
++
++static void
++add_input (const char *filename, char ***package_names, size_t *n_package_names)
++{
++  char *orig_input_buffer = NULL;
++  char *input_buffer;
++  char *position_of_newline;
++  char **names = *package_names;
++  char **new_names = NULL;
++  size_t n_names = *n_package_names;
++
++  if (!*package_names)
++    new_names = names = xmalloc (sizeof (char *) * 2);
++
++  if (read_file (filename, &orig_input_buffer) < 2)
++    {
++      if (new_names)
++	free (new_names);
++      if (orig_input_buffer)
++	free (orig_input_buffer);
++      return;
++    }
++
++  input_buffer = orig_input_buffer;
++  while (input_buffer && *input_buffer &&
++	 (position_of_newline = strchrnul (input_buffer, '\n')))
++    {
++      size_t sz = position_of_newline - input_buffer;
++      char *new;
++
++      if (sz == 0)
++	{
++	  input_buffer = position_of_newline + 1;
++	  continue;
++	}
++
++      new = xmalloc (sz+1);
++      strncpy (new, input_buffer, sz);
++      new[sz] = '\0';
++
++      names = xrealloc (names, sizeof (char *) * (n_names + 1));
++      names[n_names] = new;
++      n_names++;
++
++      /* move buffer ahead to next line */
++      input_buffer = position_of_newline + 1;
++      if (*position_of_newline == '\0')
++	input_buffer = NULL;
++    }
++
++  free (orig_input_buffer);
++
++  *package_names = names;
++  *n_package_names = n_names;
++}
++
++static char *
++help_filter (int key, const char *text, void *input __attribute__ ((unused)))
++{
++  return (char *)text;
++}
++
++static struct argp_option options[] = {
++  { 0, }
++};
++
++struct arguments
++{
++  size_t ninputs;
++  size_t input_max;
++  char **inputs;
++};
++
++static error_t
++argp_parser (int key, char *arg, struct argp_state *state)
++{
++  struct arguments *arguments = state->input;
++  switch (key)
++    {
++    case ARGP_KEY_ARG:
++      assert (arguments->ninputs < arguments->input_max);
++      arguments->inputs[arguments->ninputs++] = xstrdup (arg);
++      break;
++    default:
++      return ARGP_ERR_UNKNOWN;
++    }
++  return 0;
++}
++
++static struct argp argp = {
++  options, argp_parser, N_("[INPUT_FILES]"),
++  N_("Sort a list of strings in RPM version sort order."),
++  NULL, help_filter, NULL
++};
++
++int
++main (int argc, char *argv[])
++{
++  struct arguments arguments;
++  char **package_names = NULL;
++  size_t n_package_names = 0;
++  int i;
++
++  grub_util_host_init (&argc, &argv);
++
++  memset (&arguments, 0, sizeof (struct arguments));
++  arguments.input_max = argc+1;
++  arguments.inputs = xmalloc ((arguments.input_max + 1)
++			      * sizeof (arguments.inputs[0]));
++  memset (arguments.inputs, 0, (arguments.input_max + 1)
++	  * sizeof (arguments.inputs[0]));
++
++  /* Parse our arguments */
++  if (argp_parse (&argp, argc, argv, 0, 0, &arguments) != 0)
++    grub_util_error ("%s", _("Error in parsing command line arguments\n"));
++
++  /* If there's no inputs in argv, add one for stdin */
++  if (!arguments.ninputs)
++    {
++      arguments.ninputs = 1;
++      arguments.inputs[0] = xmalloc (2);
++      strcpy(arguments.inputs[0], "-");
++    }
++
++  for (i = 0; i < arguments.ninputs; i++)
++    add_input(arguments.inputs[i], &package_names, &n_package_names);
++
++  if (package_names == NULL || n_package_names < 1)
++    grub_util_error ("%s", _("Invalid input\n"));
++
++  qsort (package_names, n_package_names, sizeof (char *),
++	 package_version_compare);
++
++  /* send sorted list to stdout */
++  for (i = 0; i < n_package_names; i++)
++    {
++      fprintf (stdout, "%s\n", package_names[i]);
++      free (package_names[i]);
++    }
++
++  free (package_names);
++  for (i = 0; i < arguments.ninputs; i++)
++    free (arguments.inputs[i]);
++
++  free (arguments.inputs);
++
++  return 0;
++}
+diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
+index 1a4a57898f9..113a41f9409 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,6 +217,12 @@ version_sort ()
+    esac
+ }
+ 
++if [ "x$grub_rpm_sort" != x -a -x "$grub_rpm_sort" ]; then
++  kernel_sort="$grub_rpm_sort"
++else
++  kernel_sort=version_sort
++fi
++
+ version_test_numeric ()
+ {
+   version_test_numeric_a="$1"
+@@ -230,7 +239,7 @@ version_test_numeric ()
+     version_test_numeric_a="$version_test_numeric_b"
+     version_test_numeric_b="$version_test_numeric_c"
+   fi
+-  if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | version_sort | head -n 1 | grep -qx "$version_test_numeric_b" ; then
++  if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | "$kernel_sort" | head -n 1 | grep -qx "$version_test_numeric_b" ; then
+     return 0
+   else
+     return 1
+diff --git a/util/grub-rpm-sort.8 b/util/grub-rpm-sort.8
+new file mode 100644
+index 00000000000..8ce21488448
+--- /dev/null
++++ b/util/grub-rpm-sort.8
+@@ -0,0 +1,12 @@
++.TH GRUB-RPM-SORT 8 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-rpm-sort\fR \(em Sort input according to RPM version compare.
++
++.SH SYNOPSIS
++\fBgrub-rpm-sort\fR [OPTIONS].
++
++.SH DESCRIPTION
++You should not normally run this program directly.  Use grub-mkconfig instead.
++
++.SH SEE ALSO
++.BR "info grub"

0058-Handle-rssd-storage-devices.patch

@@ -0,0 +1,36 @@
+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 90d92d3ad5c..6d9f4e5faa2 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')
+ 	{

0059-Make-grub2-mkconfig-construct-titles-that-look-like-.patch

@@ -12,10 +12,10 @@ 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 b7809091b36..993c53ad92e 100644
+index d12d2d784dc..12a20c9ad73 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -80,6 +80,32 @@ case x"$GRUB_FS" in
+@@ -78,6 +78,32 @@ case x"$GRUB_FS" in
  	;;
  esac
  
@@ -48,7 +48,7 @@ index b7809091b36..993c53ad92e 100644
  title_correction_code=
  
  linux_entry ()
-@@ -93,17 +119,11 @@ linux_entry ()
+@@ -91,17 +117,11 @@ linux_entry ()
        boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
    fi
    if [ x$type != xsimple ] ; then

0060-Add-friendly-grub2-password-config-tool-985962.patch

@@ -13,38 +13,36 @@ 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]
-Signed-off-by: Andy Lutomirski <luto@kernel.org>
-[rharwood: migrate man page to h2m, context]
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+Andy Lutomirski <luto@kernel.org>
 ---
- configure.ac                   |   1 +
- Makefile.util.def              |  13 +++++
- docs/man/grub-set-password.h2m |   2 +
- util/grub-mkconfig.in          |   2 +
- util/grub-set-password.in      | 128 +++++++++++++++++++++++++++++++++++++++++
- util/grub.d/01_users.in        |  11 ++++
- 6 files changed, 157 insertions(+)
- create mode 100644 docs/man/grub-set-password.h2m
+ 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 ae3a49321ad..493e336ec6c 100644
+index 6927615819b..68501662e8d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -77,6 +77,7 @@ grub_TRANSFORM([grub-mkrelpath])
+@@ -69,6 +69,7 @@ grub_TRANSFORM([grub-mkrelpath])
  grub_TRANSFORM([grub-mkrescue])
  grub_TRANSFORM([grub-probe])
  grub_TRANSFORM([grub-reboot])
 +grub_TRANSFORM([grub-set-password])
+ grub_TRANSFORM([grub-rpm-sort])
  grub_TRANSFORM([grub-script-check])
  grub_TRANSFORM([grub-set-default])
- grub_TRANSFORM([grub-sparc64-setup])
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 09bfcadd976..95884956a68 100644
+index 843ce092b94..e50436a4987 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -455,6 +455,12 @@ script = {
+@@ -451,6 +451,12 @@ script = {
    installdir = grubconf;
  };
  
@@ -71,19 +69,11 @@ index 09bfcadd976..95884956a68 100644
  script = {
    name = grub-mkconfig_lib;
    common = util/grub-mkconfig_lib.in;
-diff --git a/docs/man/grub-set-password.h2m b/docs/man/grub-set-password.h2m
-new file mode 100644
-index 00000000000..10ee82f4d52
---- /dev/null
-+++ b/docs/man/grub-set-password.h2m
-@@ -0,0 +1,2 @@
-+[NAME]
-+grub-set-password \- generate the user.cfg file containing the hashed grub bootloader password
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 7b355115dd4..5f2824d4f58 100644
+index c645351dd2a..4e7a875309e 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -280,6 +280,8 @@ for i in "${grub_mkconfig_dir}"/* ; do
+@@ -282,6 +282,8 @@ for i in "${grub_mkconfig_dir}"/* ; do
      *~) ;;
      # emacsen autosave files. FIXME: support other editors
      */\#*\#) ;;
@@ -92,6 +82,40 @@ index 7b355115dd4..5f2824d4f58 100644
      *)
        if grub_file_is_not_garbage "$i" && test -x "$i" ; then
          echo
+diff --git a/util/grub-set-password.8 b/util/grub-set-password.8
+new file mode 100644
+index 00000000000..9646546e43d
+--- /dev/null
++++ b/util/grub-set-password.8
+@@ -0,0 +1,28 @@
++.TH GRUB-SET-PASSWORD 3 "Thu Jun 25 2015"
++.SH NAME
++\fBgrub-set-password\fR \(em Generate the user.cfg file containing the hashed grub bootloader password.
++
++.SH SYNOPSIS
++\fBgrub-set-password\fR [OPTION]
++
++.SH DESCRIPTION
++\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>.
++
++.SH OPTIONS
++.TP
++-h, --help
++Display program usage and exit.
++.TP
++-v, --version
++Display the current version.
++.TP
++-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-set-password.in b/util/grub-set-password.in
 new file mode 100644
 index 00000000000..5ebf50576d6

0060-Fixup-for-newer-compiler.patch

@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 10 May 2018 13:40:19 -0400
-Subject: [PATCH] Fixup for newer compiler
-
----
- grub-core/fs/btrfs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 87e4dd1a07a..ad35e75750b 100644
---- a/grub-core/fs/btrfs.c
-+++ b/grub-core/fs/btrfs.c
-@@ -218,7 +218,7 @@ struct grub_btrfs_inode
-   grub_uint64_t size;
-   grub_uint8_t dummy2[0x70];
-   struct grub_btrfs_time mtime;
--} GRUB_PACKED;
-+} GRUB_PACKED  __attribute__ ((aligned(8)));
- 
- struct grub_btrfs_extent_data
- {

0061-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 93dee0caa1b..902ab7e8ae6 100644
+index e8ad34b84d4..7d4b822626d 100644
 --- a/grub-core/net/tcp.c
 +++ b/grub-core/net/tcp.c
 @@ -106,6 +106,18 @@ struct tcphdr
@@ -39,7 +39,7 @@ index 93dee0caa1b..902ab7e8ae6 100644
  struct tcp_pseudohdr
  {
    grub_uint32_t src;
-@@ -571,7 +583,7 @@ grub_net_tcp_open (char *server,
+@@ -566,7 +578,7 @@ grub_net_tcp_open (char *server,
    grub_net_tcp_socket_t socket;
    static grub_uint16_t in_port = 21550;
    struct grub_net_buff *nb;
@@ -48,7 +48,7 @@ index 93dee0caa1b..902ab7e8ae6 100644
    int i;
    grub_uint8_t *nbd;
    grub_net_link_level_address_t ll_target_addr;
-@@ -640,20 +652,24 @@ grub_net_tcp_open (char *server,
+@@ -635,20 +647,24 @@ grub_net_tcp_open (char *server,
      }
  
    tcph = (void *) nb->data;

0062-Fix-security-issue-when-reading-username-and-passwor.patch

@@ -0,0 +1,44 @@
+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 ca334d5a40e..e6c78d16d39 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 6be678c0de1..c35ce972473 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)
+ 	    {

0064-efinet-and-bootp-add-support-for-dhcpv6.patch

@@ -5,19 +5,27 @@ Subject: [PATCH] efinet and bootp: add support for dhcpv6
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- grub-core/net/bootp.c              | 173 +++++++++++++++++++++++++++++++++++++
- grub-core/net/drivers/efi/efinet.c |  84 +++++++++++++-----
+ grub-core/net/bootp.c              | 174 +++++++++++++++++++++++++++++++++++++
+ grub-core/net/drivers/efi/efinet.c |  54 ++++++++++--
  grub-core/net/net.c                |  72 +++++++++++++++
- grub-core/net/tftp.c               |   3 +
+ grub-core/net/tftp.c               |   4 +
  include/grub/efi/api.h             | 129 +++++++++++++++++++++++++--
  include/grub/net.h                 |  60 +++++++++++++
- 6 files changed, 491 insertions(+), 30 deletions(-)
+ 6 files changed, 479 insertions(+), 14 deletions(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index abe45ef7bf6..02d2c2614cb 100644
+index 0e6e41a1699..8c969595a7b 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
-@@ -905,6 +905,179 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
+@@ -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>
+ 
+ struct grub_dhcp_discover_options
+@@ -935,6 +936,179 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
  
  static grub_command_t cmd_getdhcp, cmd_bootp, cmd_dhcp;
  
@@ -198,15 +206,16 @@ index abe45ef7bf6..02d2c2614cb 100644
  grub_bootp_init (void)
  {
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 3ea25cf9894..2af8742f904 100644
+index 5388f952ba9..a57189e8bb3 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
-@@ -18,11 +18,14 @@
+@@ -18,11 +18,15 @@
  
  #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>
@@ -216,16 +225,16 @@ index 3ea25cf9894..2af8742f904 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -346,7 +349,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -329,7 +333,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  			  char **path)
  {
    struct grub_net_card *card;
 -  grub_efi_device_path_t *dp;
 +  grub_efi_device_path_t *dp, *ldp = NULL;
-   struct grub_net_network_level_interface *inter;
-   grub_efi_device_path_t *vlan_dp;
-   grub_efi_uint16_t vlan_dp_len;
-@@ -361,14 +364,19 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+ 
+   dp = grub_efi_get_device_path (hnd);
+   if (! dp)
+@@ -340,14 +344,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;
@@ -246,7 +255,7 @@ index 3ea25cf9894..2af8742f904 100644
  	int match;
  
  	/* EDK2 UEFI PXE driver creates pseudo devices with type IPv4/IPv6
-@@ -377,7 +385,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -356,7 +365,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	   devices. We skip them when enumerating cards, so here we need to
  	   find matching MAC device.
           */
@@ -254,7 +263,7 @@ index 3ea25cf9894..2af8742f904 100644
  	if (GRUB_EFI_DEVICE_PATH_TYPE (ldp) != GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
  	    || (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE
  		&& GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV6_DEVICE_PATH_SUBTYPE))
-@@ -394,41 +401,70 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -373,16 +381,46 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	if (!match)
  	  continue;
        }
@@ -265,6 +274,11 @@ index 3ea25cf9894..2af8742f904 100644
        continue;
 +
      pxe_mode = pxe->mode;
+-    grub_net_configure_by_dhcp_ack (card->name, card, 0,
+-				    (struct grub_net_bootp_packet *)
+-				    &pxe_mode->dhcp_ack,
+-				    sizeof (pxe_mode->dhcp_ack),
+-				    1, device, path);
 +    if (pxe_mode->using_ipv6)
 +      {
 +	grub_net_link_level_address_t hwaddr;
@@ -276,86 +290,41 @@ index 3ea25cf9894..2af8742f904 100644
 +		      pxe_mode->dhcp_ack_received ? "" : " cannot continue");
 +	if (!pxe_mode->dhcp_ack_received)
 +	  continue;
- 
--    inter = grub_net_configure_by_dhcp_ack (card->name, card, 0,
--					    (struct grub_net_bootp_packet *)
--					    &pxe_mode->dhcp_ack,
--					    sizeof (pxe_mode->dhcp_ack),
--					    1, device, path);
++
 +	hwaddr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
 +	grub_memcpy (hwaddr.mac,
 +		     card->efi_net->mode->current_address,
 +		     sizeof (hwaddr.mac));
- 
--    if (inter != NULL)
-+	inter = grub_net_configure_by_dhcpv6_ack (card->name, card, 0, &hwaddr,
++
++	intf = grub_net_configure_by_dhcpv6_ack (card->name, card, 0, &hwaddr,
 +	      (const struct grub_net_dhcpv6_packet *)&pxe_mode->dhcp_ack.dhcpv6,
 +	      1, device, path);
-+	if (inter && device && path)
++	if (intf && device && path)
 +	  grub_dprintf ("efinet", "device: `%s' path: `%s'\n", *device, *path);
 +      }
 +    else
-       {
--	/*
--	 * Search the device path for any VLAN subtype and use it
--	 * to configure the interface.
--	 */
--	vlan_dp = dp;
++      {
 +	grub_dprintf ("efinet", "using ipv4 and dhcp\n");
-+	inter = grub_net_configure_by_dhcp_ack (card->name, card, 0,
-+						(struct grub_net_bootp_packet *)
-+						&pxe_mode->dhcp_ack,
-+						sizeof (pxe_mode->dhcp_ack),
-+						1, device, path);
- 
--	while (!GRUB_EFI_END_ENTIRE_DEVICE_PATH (vlan_dp))
++	grub_net_configure_by_dhcp_ack (card->name, card, 0,
++					(struct grub_net_bootp_packet *)
++					&pxe_mode->dhcp_ack,
++					sizeof (pxe_mode->dhcp_ack),
++					1, device, path);
 +	grub_dprintf ("efinet", "device: `%s' path: `%s'\n", *device, *path);
-+	if (inter != NULL)
- 	  {
--	    if (GRUB_EFI_DEVICE_PATH_TYPE (vlan_dp) == GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE &&
--		GRUB_EFI_DEVICE_PATH_SUBTYPE (vlan_dp) == GRUB_EFI_VLAN_DEVICE_PATH_SUBTYPE)
-+	    /*
-+	     * Search the device path for any VLAN subtype and use it
-+	     * to configure the interface.
-+	     */
-+	    vlan_dp = dp;
-+
-+	    while (!GRUB_EFI_END_ENTIRE_DEVICE_PATH (vlan_dp))
- 	      {
--		vlan = (grub_efi_vlan_device_path_t *) vlan_dp;
--		inter->vlantag = vlan->vlan_id;
--		break;
-+		if (GRUB_EFI_DEVICE_PATH_TYPE (vlan_dp) == GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE &&
-+		    GRUB_EFI_DEVICE_PATH_SUBTYPE (vlan_dp) == GRUB_EFI_VLAN_DEVICE_PATH_SUBTYPE)
-+		  {
-+		    vlan = (grub_efi_vlan_device_path_t *) vlan_dp;
-+		    inter->vlantag = vlan->vlan_id;
-+		    break;
-+		  }
-+
-+		vlan_dp_len = GRUB_EFI_DEVICE_PATH_LENGTH (vlan_dp);
-+		vlan_dp = (grub_efi_device_path_t *) ((grub_efi_uint8_t *) vlan_dp + vlan_dp_len);
- 	      }
--
--	    vlan_dp_len = GRUB_EFI_DEVICE_PATH_LENGTH (vlan_dp);
--	    vlan_dp = (grub_efi_device_path_t *) ((grub_efi_uint8_t *) vlan_dp + vlan_dp_len);
- 	  }
-+	return;
-       }
--    return;
++      }
+     return;
    }
  }
- 
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 54451cea2a7..20c55257647 100644
+index 4b7972b8e7e..f24f1fd63f6 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
-@@ -984,6 +984,78 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
+@@ -955,6 +955,78 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
    grub_net_network_level_interfaces = inter;
  }
  
 +int
-+grub_ipv6_get_masksize (grub_uint16_t *be_mask)
++grub_ipv6_get_masksize (grub_uint16_t be_mask[8])
 +{
 +  grub_uint8_t *mask;
 +  grub_uint16_t mask16[8];
@@ -430,36 +399,38 @@ index 54451cea2a7..20c55257647 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 409b1d09bcd..f300a9d4007 100644
+index 7d90bf66e76..1157524fc50 100644
 --- a/grub-core/net/tftp.c
 +++ b/grub-core/net/tftp.c
-@@ -359,6 +359,7 @@ tftp_open (struct grub_file *file, const char *filename)
-   file->not_easily_seekable = 1;
-   file->data = data;
+@@ -379,19 +379,23 @@ tftp_open (struct grub_file *file, const char *filename)
+       return grub_errno;
+     }
  
 +  grub_dprintf("tftp", "resolving address for %s\n", file->device->net->server);
    err = grub_net_resolve_address (file->device->net->server, &addr);
    if (err)
      {
-@@ -369,11 +370,13 @@ tftp_open (struct grub_file *file, const char *filename)
++      grub_dprintf("tftp", "Address resolution failed: %d\n", err);
+       destroy_pq (data);
+       grub_free (data);
        return err;
      }
  
 +  grub_dprintf("tftp", "opening connection\n");
    data->sock = grub_net_udp_open (addr,
- 				  port ? port : TFTP_SERVER_PORT, tftp_receive,
+ 				  TFTP_SERVER_PORT, tftp_receive,
  				  file);
    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 d44d00ad7d5..c6d702831f7 100644
+index addcbfa8fb7..d97cdf98c80 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -637,10 +637,16 @@ typedef void *grub_efi_handle_t;
+@@ -572,10 +572,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;
@@ -480,7 +451,7 @@ index d44d00ad7d5..c6d702831f7 100644
  typedef grub_efi_uint64_t grub_efi_physical_address_t;
  typedef grub_efi_uint64_t grub_efi_virtual_address_t;
  
-@@ -1521,16 +1527,127 @@ struct grub_efi_simple_text_output_interface
+@@ -1450,16 +1456,127 @@ struct grub_efi_simple_text_output_interface
  };
  typedef struct grub_efi_simple_text_output_interface grub_efi_simple_text_output_interface_t;
  
@@ -611,10 +582,10 @@ index d44d00ad7d5..c6d702831f7 100644
  
  typedef struct grub_efi_pxe
 diff --git a/include/grub/net.h b/include/grub/net.h
-index 844e501c128..bf8430a6364 100644
+index ff6d347f7da..3647012374b 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
-@@ -450,6 +450,51 @@ struct grub_net_bootp_packet
+@@ -447,6 +447,51 @@ struct grub_net_bootp_packet
    grub_uint8_t vendor[0];
  } GRUB_PACKED;
  
@@ -666,7 +637,7 @@ index 844e501c128..bf8430a6364 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
-@@ -485,6 +530,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);
  

0065-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch

@@ -10,24 +10,23 @@ variables are then used by 10_linux to choose whether or not to create
 debug stanzas.
 
 Resolves: rhbz#1226325
-[rharwood: migrate man page to h2m]
 ---
- configure.ac                                   |  1 +
+ configure.ac                                   |  2 +
  Makefile.util.def                              |  7 ++
- docs/man/grub-get-kernel-settings.h2m          |  2 +
  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 +++++--
- 7 files changed, 141 insertions(+), 5 deletions(-)
- create mode 100644 docs/man/grub-get-kernel-settings.h2m
+ 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 493e336ec6c..3602b4ab62b 100644
+index 68501662e8d..fc3c2b44d60 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -70,6 +70,7 @@ grub_TRANSFORM([grub-install])
+@@ -62,6 +62,7 @@ grub_TRANSFORM([grub-install])
  grub_TRANSFORM([grub-mkconfig])
  grub_TRANSFORM([grub-mkfont])
  grub_TRANSFORM([grub-mkimage])
@@ -35,8 +34,16 @@ index 493e336ec6c..3602b4ab62b 100644
  grub_TRANSFORM([grub-glue-efi])
  grub_TRANSFORM([grub-mklayout])
  grub_TRANSFORM([grub-mkpasswd-pbkdf2])
+@@ -79,6 +80,7 @@ grub_TRANSFORM([grub-file])
+ grub_TRANSFORM([grub-bios-setup.3])
+ grub_TRANSFORM([grub-editenv.1])
+ grub_TRANSFORM([grub-fstest.3])
++grub_TRANSFORM([grub-get-kernel-settings.3])
+ grub_TRANSFORM([grub-glue-efi.3])
+ grub_TRANSFORM([grub-install.1])
+ grub_TRANSFORM([grub-kbdcomp.3])
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 95884956a68..84a17ef5cfa 100644
+index e50436a4987..2215cc759c0 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -725,6 +725,13 @@ script = {
@@ -53,19 +60,11 @@ index 95884956a68..84a17ef5cfa 100644
  script = {
    name = grub-set-default;
    common = util/grub-set-default.in;
-diff --git a/docs/man/grub-get-kernel-settings.h2m b/docs/man/grub-get-kernel-settings.h2m
-new file mode 100644
-index 00000000000..b8051f01f3a
---- /dev/null
-+++ b/docs/man/grub-get-kernel-settings.h2m
-@@ -0,0 +1,2 @@
-+[NAME]
-+grub-get-kernel-settings \- Evaluate the system's kernel installation settings for use while making a grub configuration file
 diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in
-index 213ce1e57cf..da7fca5efac 100644
+index 44bf135b9f8..5c4acd496d4 100644
 --- a/util/bash-completion.d/grub-completion.bash.in
 +++ b/util/bash-completion.d/grub-completion.bash.in
-@@ -275,6 +275,28 @@ have ${__grub_sparc64_setup_program} && \
+@@ -264,6 +264,28 @@ have ${__grub_sparc64_setup_program} && \
  unset __grub_sparc64_setup_program
  
  
@@ -94,6 +93,32 @@ index 213ce1e57cf..da7fca5efac 100644
  #
  # grub-install
  #
+diff --git a/util/grub-get-kernel-settings.3 b/util/grub-get-kernel-settings.3
+new file mode 100644
+index 00000000000..ba33330e28d
+--- /dev/null
++++ b/util/grub-get-kernel-settings.3
+@@ -0,0 +1,20 @@
++.TH GRUB-GET-KERNEL-SETTINGS 3 "Thu Jun 25 2015"
++.SH NAME
++\fBgrub-get-kernel-settings\fR \(em Evaluate the system's kernel installation settings for use while making a grub configuration file.
++
++.SH SYNOPSIS
++\fBgrub-get-kernel-settings\fR [OPTION]
++
++.SH DESCRIPTION
++\fBgrub-get-kernel-settings\fR reads the kernel installation settings on the host system, and emits a set of grub settings suitable for use when creating a grub configuration file.
++
++.SH OPTIONS
++.TP
++-h, --help
++Display program usage and exit.
++.TP
++-v, --version
++Display the current version.
++
++.SH SEE ALSO
++.BR "info grub"
 diff --git a/util/grub-get-kernel-settings.in b/util/grub-get-kernel-settings.in
 new file mode 100644
 index 00000000000..7e87dfccc0e
@@ -189,7 +214,7 @@ index 00000000000..7e87dfccc0e
 +    echo export GRUB_UPDATE_DEFAULT_KERNEL
 +fi
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 5f2824d4f58..28e92515795 100644
+index 4e7a875309e..6247a0ba850 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -45,6 +45,7 @@ grub_probe="${sbindir}/@grub_probe@"
@@ -206,14 +231,14 @@ index 5f2824d4f58..28e92515795 100644
  
 +eval "$("${grub_get_kernel_settings}")" || true
 +
- if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
-   if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then
-     GRUB_DISABLE_LINUX_UUID="true"
+ if [ "x$GRUB_DISABLE_UUID" != "xtrue" ]; then
+   if [ -z "$GRUB_DEVICE_UUID" ]; then
+     GRUB_DEVICE_UUID="$GRUB_DEVICE_UUID_GENERATED"
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 993c53ad92e..e8ab4082f87 100644
+index 12a20c9ad73..55f4aa783cf 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -113,7 +113,8 @@ linux_entry ()
+@@ -111,7 +111,8 @@ linux_entry ()
    os="$1"
    version="$2"
    type="$3"
@@ -223,7 +248,7 @@ index 993c53ad92e..e8ab4082f87 100644
  
    if [ -z "$boot_device_id" ]; then
        boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
-@@ -125,6 +126,9 @@ linux_entry ()
+@@ -123,6 +124,9 @@ linux_entry ()
  	  quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
  	  title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
        fi
@@ -233,7 +258,7 @@ index 993c53ad92e..e8ab4082f87 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/"
-@@ -320,11 +324,15 @@ for linux in ${reverse_sorted_list}; do
+@@ -295,11 +299,15 @@ while [ "x$list" != "x" ] ; do
    fi
  
    if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
@@ -251,7 +276,7 @@ index 993c53ad92e..e8ab4082f87 100644
      if [ -z "$boot_device_id" ]; then
  	boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
      fi
-@@ -333,10 +341,15 @@ for linux in ${reverse_sorted_list}; do
+@@ -308,10 +316,15 @@ while [ "x$list" != "x" ] ; do
      is_top_level=false
    fi
  
@@ -266,6 +291,6 @@ index 993c53ad92e..e8ab4082f87 100644
    if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
 -    linux_entry "${OS}" "${version}" recovery \
 +    linux_entry "${OS}" "${version}" recovery standard \
-                 "${GRUB_CMDLINE_LINUX_RECOVERY} ${GRUB_CMDLINE_LINUX}"
+                 "single ${GRUB_CMDLINE_LINUX}"
    fi
- done
+ 

0066-Normalize-slashes-in-tftp-paths.patch

@@ -0,0 +1,61 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lenny Szubowicz <lszubowi@redhat.com>
+Date: Mon, 29 Aug 2016 11:04:48 -0400
+Subject: [PATCH] Normalize slashes in tftp paths.
+
+Some tftp servers do not handle multiple consecutive slashes correctly;
+this patch avoids sending tftp requests with non-normalized paths.
+
+Signed-off-by: Lenny Szubowicz <lszubowi@redhat.com>
+[msalter: fix malformed tftp packets]
+Signed-off-by: Mark Salter <msalter@redhat.com>
+---
+ grub-core/net/tftp.c | 28 +++++++++++++++++++++++++---
+ 1 file changed, 25 insertions(+), 3 deletions(-)
+
+diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
+index 1157524fc50..dcd82494309 100644
+--- a/grub-core/net/tftp.c
++++ b/grub-core/net/tftp.c
+@@ -300,6 +300,25 @@ destroy_pq (tftp_data_t data)
+   grub_priority_queue_destroy (data->pq);
+ }
+ 
++/* Create a normalized copy of the filename.
++   Compress any string of consecutive forward slashes to a single forward
++   slash. */
++static void
++grub_normalize_filename (char *normalized, const char *filename)
++{
++  char *dest = normalized;
++  char *src = filename;
++
++  while (*src != '\0')
++    {
++      if (src[0] == '/' && src[1] == '/')
++	src++;
++      else
++	*dest++ = *src++;
++    }
++  *dest = '\0';
++}
++
+ static grub_err_t
+ tftp_open (struct grub_file *file, const char *filename)
+ {
+@@ -337,9 +356,12 @@ tftp_open (struct grub_file *file, const char *filename)
+   rrqlen = 0;
+ 
+   tftph->opcode = grub_cpu_to_be16_compile_time (TFTP_RRQ);
+-  grub_strcpy (rrq, filename);
+-  rrqlen += grub_strlen (filename) + 1;
+-  rrq += grub_strlen (filename) + 1;
++
++  /* Copy and normalize the filename to work-around issues on some tftp
++     servers when file names are being matched for remapping. */
++  grub_normalize_filename (rrq, filename);
++  rrqlen += grub_strlen (rrq) + 1;
++  rrq += grub_strlen (rrq) + 1;
+ 
+   grub_strcpy (rrq, "octet");
+   rrqlen += grub_strlen ("octet") + 1;

0067-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch

@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Mon, 20 Jul 2020 12:24:02 -0400
-Subject: [PATCH] Fix const char ** pointers in grub-core/net/bootp.c
-
-This will need to get folded back in the right place on the next rebase,
-but it's before "Make grub_strtol() "end" pointers have safer const
-qualifiers" currently, so for now I'm leaving it here instead of merging
-it back with the original patch.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/net/bootp.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index f56b293ac72..9cbdc2264c9 100644
---- a/grub-core/net/bootp.c
-+++ b/grub-core/net/bootp.c
-@@ -329,7 +329,7 @@ grub_net_configure_by_dhcp_ack (const char *name,
-   struct grub_net_network_level_interface *inter;
-   int mask = -1;
-   char server_ip[sizeof ("xxx.xxx.xxx.xxx")];
--  const grub_uint8_t *opt;
-+  const char *opt;
-   grub_uint8_t opt_len, overload = 0;
-   const char *boot_file = 0, *server_name = 0;
-   grub_size_t boot_file_len, server_name_len;
-@@ -506,7 +506,7 @@ grub_net_configure_by_dhcp_ack (const char *name,
-   if (opt && opt_len)
-     {
-       grub_env_set_net_property (name, "vendor_class_identifier", (const char *) opt, opt_len);
--      if (opt && grub_strcmp (opt, "HTTPClient") == 0)
-+      if (opt && grub_strcmp ((char *)opt, "HTTPClient") == 0)
-         {
-           char *proto, *ip, *pa;
- 

0067-bz1374141-fix-incorrect-mask-for-ppc64.patch

@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Masahiro Matsuya <mmatsuya@redhat.com>
+Date: Sat, 29 Oct 2016 08:35:26 +0900
+Subject: [PATCH] bz1374141 fix incorrect mask for ppc64
+
+The netmask configured in firmware is not respected on ppc64 (big endian).
+When 255.255.252.0 is set as netmask in firmware, the following is the value of bootpath string in grub_ieee1275_parse_bootpath().
+
+ /vdevice/l-lan@30000002:speed=auto,duplex=auto,192.168.88.10,,192.168.89.113,192.168.88.1,5,5,255.255.252.0,512
+
+The netmask in this bootpath is no problem, since it's a value specified in firmware. But,
+The value of 'subnet_mask.ipv4' was set with 0xfffffc00, and __builtin_ctz (~grub_le_to_cpu32 (subnet_mask.ipv4)) returned 16 (not 22).
+As a result, 16 was used for netmask wrongly.
+
+1111 1111 1111 1111 1111 1100 0000 0000 # subnet_mask.ipv4 (=0xfffffc00)
+0000 0000 1111 1100 1111 1111 1111 1111 # grub_le_to_cpu32 (subnet_mask.ipv4)
+1111 1111 0000 0011 0000 0000 0000 0000 # ~grub_le_to_cpu32 (subnet_mask.ipv4)
+
+And, the count of zero with __builtin_ctz can be 16.
+This patch changes it as below.
+
+1111 1111 1111 1111 1111 1100 0000 0000 # subnet_mask.ipv4 (=0xfffffc00)
+0000 0000 1111 1100 1111 1111 1111 1111 # grub_le_to_cpu32 (subnet_mask.ipv4)
+1111 1111 1111 1111 1111 1100 0000 0000 # grub_swap_bytes32(grub_le_to_cpu32 (subnet_mask.ipv4))
+0000 0000 0000 0000 0000 0011 1111 1111 # ~grub_swap_bytes32(grub_le_to_cpu32 (subnet_mask.ipv4))
+
+The count of zero with __builtin_clz can be 22. (clz counts the number of one bits preceding the most significant zero bit)
+---
+ grub-core/net/drivers/ieee1275/ofnet.c | 3 +--
+ 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 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,
+                                  flags);
+       inter->vlantag = vlantag;
+       grub_net_add_ipv4_local (inter,
+-                          __builtin_ctz (~grub_le_to_cpu32 (subnet_mask.ipv4)));
+-
++                          __builtin_clz (~grub_swap_bytes32(grub_le_to_cpu32 (subnet_mask.ipv4))));
+     }
+ 
+   if (gateway_addr.ipv4 != 0)

0068-Make-grub_fatal-also-backtrace.patch

@@ -5,18 +5,18 @@ Subject: [PATCH] Make grub_fatal() also backtrace.
 
 ---
  grub-core/Makefile.core.def     |  3 ++
- grub-core/kern/misc.c           |  6 ++++
+ grub-core/kern/misc.c           |  8 +++++-
  grub-core/lib/arm64/backtrace.c | 62 +++++++++++++++++++++++++++++++++++++++++
  grub-core/lib/backtrace.c       |  2 ++
  grub-core/lib/i386/backtrace.c  | 14 +++++++++-
- 5 files changed, 86 insertions(+), 1 deletion(-)
+ 5 files changed, 87 insertions(+), 2 deletions(-)
  create mode 100644 grub-core/lib/arm64/backtrace.c
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 47c0fc755a2..63f053b3add 100644
+index 99466b1e47e..ebc558019cd 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -199,6 +199,9 @@ kernel = {
+@@ -186,6 +186,9 @@ kernel = {
  
    softdiv = lib/division.c;
  
@@ -27,19 +27,19 @@ index 47c0fc755a2..63f053b3add 100644
    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 11037dc0227..465a8e74ea7 100644
+index 1c560ea570a..04371ac49f2 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
-@@ -26,6 +26,7 @@
+@@ -24,6 +24,7 @@
+ #include <grub/term.h>
+ #include <grub/env.h>
  #include <grub/i18n.h>
- #include <grub/types.h>
- #include <grub/charset.h>
 +#include <grub/backtrace.h>
  
  union printf_arg
  {
-@@ -1301,6 +1302,11 @@ grub_printf_fmt_check (const char *fmt, const char *fmt_expected)
- void __attribute__ ((noreturn))
+@@ -1101,8 +1102,13 @@ grub_xasprintf (const char *fmt, ...)
+ static void __attribute__ ((noreturn))
  grub_abort (void)
  {
 +#ifndef GRUB_UTIL
@@ -48,8 +48,11 @@ index 11037dc0227..465a8e74ea7 100644
 +#endif
 +#endif
    grub_printf ("\nAborted.");
- 
+-  
++
  #ifndef GRUB_UTIL
+   if (grub_term_inputs)
+ #endif
 diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c
 new file mode 100644
 index 00000000000..1079b5380e1

0069-Fix-up-some-man-pages-rpmdiff-noticed.patch

@@ -0,0 +1,150 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 23 Sep 2014 09:58:49 -0400
+Subject: [PATCH] Fix up some man pages rpmdiff noticed.
+
+---
+ configure.ac             |  2 ++
+ util/grub-macbless.8     | 26 +++++++++++++++++++
+ util/grub-mkimage.1      |  2 +-
+ util/grub-syslinux2cfg.1 | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 94 insertions(+), 1 deletion(-)
+ create mode 100644 util/grub-macbless.8
+ create mode 100644 util/grub-syslinux2cfg.1
+
+diff --git a/configure.ac b/configure.ac
+index fc3c2b44d60..eb851b8d722 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -84,6 +84,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3])
+ grub_TRANSFORM([grub-glue-efi.3])
+ grub_TRANSFORM([grub-install.1])
+ grub_TRANSFORM([grub-kbdcomp.3])
++grub_TRANSFORM([grub-macbless.8])
+ grub_TRANSFORM([grub-menulst2cfg.1])
+ grub_TRANSFORM([grub-mkconfig.1])
+ grub_TRANSFORM([grub-mkfont.3])
+@@ -102,6 +103,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])
++grub_TRANSFORM([grub-syslinux2cfg.1])
+ 
+ # Optimization flag.  Allow user to override.
+ if test "x$TARGET_CFLAGS" = x; then
+diff --git a/util/grub-macbless.8 b/util/grub-macbless.8
+new file mode 100644
+index 00000000000..ae842f3a606
+--- /dev/null
++++ b/util/grub-macbless.8
+@@ -0,0 +1,26 @@
++.TH GRUB-MACBLESS 1 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-macbless\fR \(em Mac-style bless utility for HFS or HFS+
++
++.SH SYNOPSIS
++\fBgrub-macbless\fR [-p | --ppc] [-v | --verbose] [-x | --x86] \fIFILE\fR
++
++.SH DESCRIPTION
++\fBgrub-mkimage\fR blesses a file on an HFS or HFS+ file system, so that it
++can be used to boot a Mac.
++
++.SH OPTIONS
++.TP
++--ppc
++Bless the file for use on PPC-based Macs.
++
++.TP
++--verbose
++Print verbose messages.
++
++.TP
++--x86
++Bless the file for use on x86-based Macs.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1
+index 4dea4f54597..0eaaafe505b 100644
+--- a/util/grub-mkimage.1
++++ b/util/grub-mkimage.1
+@@ -17,7 +17,7 @@
+ [-v | --verbose] \fIMODULES\fR
+ 
+ .SH DESCRIPTION
+-\fBgrub-mkimage\fI builds a bootable image of GRUB.
++\fBgrub-mkimage\fR builds a bootable image of GRUB.
+ 
+ .SH OPTIONS
+ .TP
+diff --git a/util/grub-syslinux2cfg.1 b/util/grub-syslinux2cfg.1
+new file mode 100644
+index 00000000000..85309482718
+--- /dev/null
++++ b/util/grub-syslinux2cfg.1
+@@ -0,0 +1,65 @@
++.TH GRUB-SYSLINUX2CFG 1 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-syslinux2cfg\fR \(em Transform a syslinux config file into a GRUB config.
++
++.SH SYNOPSIS
++\fBgrub-syslinux2cfg\fR [-c | --cwd=\fRDIR\fI] [-r | --root=\fIDIR\fR] [-v | --verbose]
++.RE
++.RS 25
++[-t | --target-root=\fIDIR\fR] [-T | --target-cwd=\fIDIR\fR]
++.RE
++.RS 25
++[-o | --output=\fIFILE\fR] [[-i | --isolinux] |
++.RE
++.RS 46
++ [-s | --syslinux] |
++.RE
++.RS 46
++ [-p | --pxelinux]] \fIFILE\fR
++
++.SH DESCRIPTION
++\fBgrub-syslinux2cfg\fR builds a GRUB configuration file out of an existing
++syslinux configuration file.
++
++.SH OPTIONS
++.TP
++--cwd=\fIDIR\fR
++Set \fIDIR\fR as syslinux's working directory.  The default is to use the
++parent directory of the input file.
++
++.TP
++--root=\fIDIR\fR
++Set \fIDIR\fR as the root directory of the syslinux disk.  The default value
++is "/".
++
++.TP
++--verbose
++Print verbose messages.
++
++.TP
++--target-root=\fIDIR\fR
++Root directory as it will be seen at runtime.  The default value is "/".
++
++.TP
++--target-cwd=\fIDIR\fR
++Working directory of syslinux as it will be seen at runtime.  The default
++value is the parent directory of the input file.
++
++.TP
++--output=\fIFILE\fR
++Write the new config file to \fIFILE\fR.  The default value is standard output.
++
++.TP
++--isolinux
++Assume that the input file is an isolinux configuration file.
++
++.TP
++--pxelinux
++Assume that the input file is a pxelinux configuration file.
++
++.TP
++--syslinux
++Assume that the input file is a syslinux configuration file.
++
++.SH SEE ALSO
++.BR "info grub"

0070-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch

@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mark Salter <msalter@redhat.com>
+Date: Mon, 17 Apr 2017 08:44:29 -0400
+Subject: [PATCH] arm64: make sure fdt has #address-cells and #size-cells
+ properties
+
+Recent upstream changes to kexec-tools relies on #address-cells
+and #size-cells properties in the FDT. If grub2 needs to create
+a chosen node, it is likely because firmware did not provide one.
+In that case, set #address-cells and #size-cells properties to
+make sure they exist.
+---
+ grub-core/loader/arm64/linux.c | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
+index 04994d5c67d..4c0a09c06de 100644
+--- a/grub-core/loader/arm64/linux.c
++++ b/grub-core/loader/arm64/linux.c
+@@ -81,7 +81,21 @@ finalize_params_linux (void)
+ 
+   node = grub_fdt_find_subnode (fdt, 0, "chosen");
+   if (node < 0)
+-    node = grub_fdt_add_subnode (fdt, 0, "chosen");
++    {
++      /*
++       * If we have to create a chosen node, Make sure we
++       * have #address-cells and #size-cells properties.
++       */
++      retval = grub_fdt_set_prop32(fdt, 0, "#address-cells", 2);
++      if (retval)
++	goto failure;
++
++      retval = grub_fdt_set_prop32(fdt, 0, "#size-cells", 2);
++      if (retval)
++	goto failure;
++
++      node = grub_fdt_add_subnode (fdt, 0, "chosen");
++    }
+ 
+   if (node < 1)
+     goto failure;

0071-Make-our-info-pages-say-grub2-where-appropriate.patch

@@ -9,11 +9,11 @@ time.
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  docs/grub-dev.texi |   4 +-
- docs/grub.texi     | 357 ++++++++++++++++++++++++++++-------------------------
- 2 files changed, 189 insertions(+), 172 deletions(-)
+ docs/grub.texi     | 318 ++++++++++++++++++++++++++---------------------------
+ 2 files changed, 161 insertions(+), 161 deletions(-)
 
 diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
-index 1276c59302a..04c6678cb6b 100644
+index ee389fd83c3..e3fed7312a3 100644
 --- a/docs/grub-dev.texi
 +++ b/docs/grub-dev.texi
 @@ -1,7 +1,7 @@
@@ -35,7 +35,7 @@ index 1276c59302a..04c6678cb6b 100644
  
  @setchapternewpage odd
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 974bc0ddb07..c30701b4e1f 100644
+index 221064b5679..960e5f3ba41 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
 @@ -1,7 +1,7 @@
@@ -72,7 +72,31 @@ index 974bc0ddb07..c30701b4e1f 100644
  @end direntry
  
  @setchapternewpage odd
-@@ -223,7 +223,7 @@ surprising.
+@@ -103,15 +103,15 @@ This edition documents version @value{VERSION}.
+ * Platform-specific operations:: Platform-specific operations
+ * Supported kernels::           The list of supported kernels
+ * Troubleshooting::             Error messages produced by GRUB
+-* Invoking grub-install::       How to use the GRUB installer
+-* Invoking grub-mkconfig::      Generate a GRUB configuration file
+-* Invoking grub-mkpasswd-pbkdf2::
++* Invoking grub2-install::       How to use the GRUB installer
++* Invoking grub2-mkconfig::      Generate a GRUB configuration file
++* Invoking grub2-mkpasswd-pbkdf2::
+                                 Generate GRUB password hashes
+-* Invoking grub-mkrelpath::     Make system path relative to its root
+-* Invoking grub-mkrescue::      Make a GRUB rescue image
+-* Invoking grub-mount::         Mount a file system using GRUB
+-* Invoking grub-probe::         Probe device information for GRUB
+-* Invoking grub-script-check::  Check GRUB script file for syntax errors
++* Invoking grub2-mkrelpath::     Make system path relative to its root
++* Invoking grub2-mkrescue::      Make a GRUB rescue image
++* Invoking grub2-mount::         Mount a file system using GRUB
++* Invoking grub2-probe::         Probe device information for GRUB
++* Invoking grub2-script-check::  Check GRUB script file for syntax errors
+ * Obtaining and Building GRUB:: How to obtain and build GRUB
+ * Reporting bugs::              Where you should send a bug report
+ * Future::                      Some future plans on GRUB
+@@ -230,7 +230,7 @@ surprising.
  
  @item
  @file{grub.cfg} is typically automatically generated by
@@ -81,7 +105,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  easier to handle versioned kernel upgrades.
  
  @item
-@@ -237,7 +237,7 @@ scripting language: variables, conditionals, and loops are available.
+@@ -244,7 +244,7 @@ scripting language: variables, conditionals, and loops are available.
  @item
  A small amount of persistent storage is available across reboots, using the
  @command{save_env} and @command{load_env} commands in GRUB and the
@@ -90,7 +114,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  (@pxref{Environment block}).
  
  @item
-@@ -542,7 +542,7 @@ On OS which have device nodes similar to Unix-like OS GRUB tools use the
+@@ -549,7 +549,7 @@ On OS which have device nodes similar to Unix-like OS GRUB tools use the
  OS name. E.g. for GNU/Linux:
  
  @example
@@ -99,7 +123,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  @end example
  
  On AROS we use another syntax. For volumes:
-@@ -565,7 +565,7 @@ For disks we use syntax:
+@@ -572,7 +572,7 @@ For disks we use syntax:
  E.g.
  
  @example
@@ -108,7 +132,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  @end example
  
  On Windows we use UNC path. For volumes it's typically
-@@ -592,7 +592,7 @@ For disks it's
+@@ -599,7 +599,7 @@ For disks it's
  E.g.
  
  @example
@@ -117,7 +141,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  @end example
  
  Beware that you may need to further escape the backslashes depending on your
-@@ -602,7 +602,7 @@ When compiled with cygwin support then cygwin drive names are automatically
+@@ -609,7 +609,7 @@ When compiled with cygwin support then cygwin drive names are automatically
  when needed. E.g.
  
  @example
@@ -126,7 +150,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  @end example
  
  @node Installation
-@@ -615,7 +615,7 @@ from the source tarball, or as a package for your OS.
+@@ -622,7 +622,7 @@ from the source tarball, or as a package for your OS.
  
  After you have done that, you need to install the boot loader on a
  drive (floppy or hard disk) by using the utility
@@ -135,7 +159,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  GRUB comes with boot images, which are normally put in the directory
  @file{/usr/lib/grub/<cpu>-<platform>} (for BIOS-based machines
-@@ -626,22 +626,22 @@ loader needs to find them (usually @file{/boot}) will be called
+@@ -633,22 +633,22 @@ loader needs to find them (usually @file{/boot}) will be called
  the @dfn{boot directory}.
  
  @menu
@@ -163,7 +187,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  The usage is basically very simple. You only need to specify one
  argument to the program, namely, where to install the boot loader. The
-@@ -650,13 +650,13 @@ For example, under Linux the following will install GRUB into the MBR
+@@ -657,13 +657,13 @@ For example, under Linux the following will install GRUB into the MBR
  of the first IDE disk:
  
  @example
@@ -179,7 +203,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  @end example
  
  But all the above examples assume that GRUB should put images under
-@@ -670,7 +670,7 @@ boot floppy with a filesystem. Here is an example:
+@@ -677,7 +677,7 @@ boot floppy with a filesystem. Here is an example:
  # @kbd{mke2fs /dev/fd0}
  # @kbd{mount -t ext2 /dev/fd0 /mnt}
  # @kbd{mkdir /mnt/boot}
@@ -188,7 +212,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  # @kbd{umount /mnt}
  @end group
  @end example
-@@ -682,30 +682,37 @@ floppy instead of exposing the USB drive as a hard disk (they call it
+@@ -689,16 +689,16 @@ 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}
@@ -199,14 +223,17 @@ index 974bc0ddb07..c30701b4e1f 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
+ you may run those commands directly to install GRUB, without using
+-@command{grub-install}. Don't do that, however, unless you are very familiar
 +@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.
-+
- 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.
+ 
+@@ -706,20 +706,20 @@ 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
@@ -230,7 +257,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  @end example
  
  @node Making a GRUB bootable CD-ROM
-@@ -725,10 +732,10 @@ usually also need to include a configuration file @file{grub.cfg} and some
+@@ -739,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
@@ -243,7 +270,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  @end example
  
  You will often need to include other files in your image. To do this, first
-@@ -751,7 +758,7 @@ directory @file{iso/}.
+@@ -765,7 +765,7 @@ directory @file{iso/}.
  Finally, make the image:
  
  @example
@@ -252,7 +279,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  @end example
  
  This produces a file named @file{grub.iso}, which then can be burned
-@@ -767,7 +774,7 @@ storage devices.
+@@ -781,7 +781,7 @@ storage devices.
  @node Device map
  @section The map between BIOS drives and OS devices
  
@@ -261,7 +288,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  etc.) read it to map BIOS drives to OS devices.  This file consists of lines
  like this:
  
-@@ -1269,23 +1276,23 @@ need to write the whole thing by hand.
+@@ -1225,23 +1225,23 @@ need to write the whole thing by hand.
  @node Simple configuration
  @section Simple configuration handling
  
@@ -290,7 +317,7 @@ index 974bc0ddb07..c30701b4e1f 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:
-@@ -1323,7 +1330,7 @@ works it's not recommended since titles often contain unstable device names
+@@ -1279,7 +1279,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
@@ -299,7 +326,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  the environment block, which may not be available in all situations
  (@pxref{Environment block}).
  
-@@ -1334,7 +1341,7 @@ If this option is set to @samp{true}, then, when an entry is selected, save
+@@ -1290,7 +1290,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
@@ -308,7 +335,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  This option relies on the environment block, which may not be available in
  all situations (@pxref{Environment block}).
  
-@@ -1481,15 +1488,15 @@ intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode
+@@ -1420,7 +1420,7 @@ intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode
  @end example
  
  @item GRUB_DISABLE_LINUX_UUID
@@ -317,17 +344,7 @@ index 974bc0ddb07..c30701b4e1f 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
- disable the use of UUIDs, set this option to @samp{true}.
- 
- @item GRUB_DISABLE_LINUX_PARTUUID
--If @command{grub-mkconfig} cannot identify the root filesystem via its
--universally-unique indentifier (UUID), @command{grub-mkconfig} can use the UUID
-+If @command{grub2-mkconfig} cannot identify the root filesystem via its
-+universally-unique indentifier (UUID), @command{grub2-mkconfig} can use the UUID
- of the partition containing the filesystem to identify the root filesystem to
- the Linux kernel via a @samp{root=PARTUUID=...} kernel parameter.  This is not
- as reliable as using the filesystem UUID, but is more reliable than using the
-@@ -1503,7 +1510,7 @@ If this option is set to @samp{true}, disable the generation of recovery
+@@ -1442,7 +1442,7 @@ If this option is set to @samp{true}, disable the generation of recovery
  mode menu entries.
  
  @item GRUB_DISABLE_UUID
@@ -336,7 +353,7 @@ index 974bc0ddb07..c30701b4e1f 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
-@@ -1514,12 +1521,12 @@ 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
  @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,
@@ -352,7 +369,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  @item GRUB_GFXMODE
  Set the resolution used on the @samp{gfxterm} graphical terminal.  Note that
-@@ -1552,7 +1559,7 @@ boot sequence.  If you have problems, set this option to @samp{text} and
+@@ -1488,7 +1488,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
@@ -361,7 +378,7 @@ index 974bc0ddb07..c30701b4e1f 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.
-@@ -1562,7 +1569,7 @@ List of space-separated FS UUIDs of filesystems to be ignored from os-prober
+@@ -1498,7 +1498,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
@@ -370,7 +387,7 @@ index 974bc0ddb07..c30701b4e1f 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
-@@ -1570,11 +1577,11 @@ in submenu. If this option is set to @samp{true}, flat menu with all entries
+@@ -1506,11 +1506,11 @@ in submenu. If this option is set to @samp{y}, 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
@@ -385,7 +402,7 @@ index 974bc0ddb07..c30701b4e1f 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.
-@@ -1633,7 +1640,7 @@ confusing @samp{GRUB_TIMEOUT_STYLE=countdown} or
+@@ -1569,7 +1569,7 @@ confusing @samp{GRUB_TIMEOUT_STYLE=countdown} or
  
  @end table
  
@@ -394,48 +411,7 @@ index 974bc0ddb07..c30701b4e1f 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
-@@ -1641,14 +1648,14 @@ that file, making sure to leave at least the first two lines intact.
- 
- @node Root Identifcation Heuristics
- @section Root Identifcation Heuristics
--If the target operating system uses the Linux kernel, @command{grub-mkconfig}
-+If the target operating system uses the Linux kernel, @command{grub2-mkconfig}
- attempts to identify the root file system via a heuristic algoirthm.  This
- algorithm selects the identification method of the root file system by
- considering three factors.  The first is if an initrd for the target operating
- system is also present.  The second is @samp{GRUB_DISABLE_LINUX_UUID} and if set
--to @samp{true}, prevents @command{grub-mkconfig} from identifying the root file
-+to @samp{true}, prevents @command{grub2-mkconfig} from identifying the root file
- system by its UUID.  The third is @samp{GRUB_DISABLE_LINUX_PARTUUID} and if set
--to @samp{true}, prevents @command{grub-mkconfig} from identifying the root file
-+to @samp{true}, prevents @command{grub2-mkconfig} from identifying the root file
- system via the UUID of its enclosing partition.  If the variables are assigned
- any other value, that value is considered equivalent to @samp{false}.  The
- variables are also considered to be set to @samp{false} if they are not set.
-@@ -1658,18 +1665,18 @@ filesystem to the initrd.  Most initrd images determine the root file system by
- checking the Linux kernel's command-line for the @samp{root} key and use its
- value as the identification method of the root file system.  To improve the
- reliability of booting, most initrd images also allow the root file system to be
--identified by its UUID.  Because of this behavior, the @command{grub-mkconfig}
-+identified by its UUID.  Because of this behavior, the @command{grub2-mkconfig}
- command will set @samp{root} to @samp{root=UUID=...} to provide the initrd with
- the filesystem UUID of the root file system.
- 
- If no initrd is detected or @samp{GRUB_DISABLE_LINUX_UUID} is set to @samp{true}
--then @command{grub-command} will identify the root filesystem by setting the
-+then @command{grub2-command} will identify the root filesystem by setting the
- kernel command-line variable @samp{root} to @samp{root=PARTUUID=...} unless
- @samp{GRUB_DISABLE_LINUX_PARTUUID} is also set to @samp{true}.  If
- @samp{GRUB_DISABLE_LINUX_PARTUUID} is also set to @samp{true},
--@command{grub-command} will identify by its Linux device name.
-+@command{grub2-command} will identify by its Linux device name.
- 
--The following table summarizes the behavior of the @command{grub-mkconfig}
-+The following table summarizes the behavior of the @command{grub2-mkconfig}
- command.
- 
- @multitable {detected} {GRUB_DISABLE_LINUX_PARTUUID} {GRUB_DISABLE_LINUX_UUID} {Linux Root}
-@@ -1898,7 +1905,7 @@ images as well.
+@@ -1831,7 +1831,7 @@ images as well.
  Mount this partition on/mnt/boot and disable GRUB in all OSes and manually
  install self-compiled latest GRUB with:
  
@@ -444,7 +420,7 @@ index 974bc0ddb07..c30701b4e1f 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
-@@ -1908,20 +1915,20 @@ use by setting:
+@@ -1841,20 +1841,20 @@ use by setting:
  
  in /etc/default/grub
  
@@ -468,7 +444,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  @}
  
  menuentry "Windows XP" @{
-@@ -1984,15 +1991,15 @@ GRUB supports embedding a configuration file directly into the core image,
+@@ -1917,15 +1917,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.
@@ -487,7 +463,7 @@ index 974bc0ddb07..c30701b4e1f 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
-@@ -2027,13 +2034,13 @@ included in the core image:
+@@ -1960,13 +1960,13 @@ included in the core image:
  @example
  @group
  search.fs_label grub root
@@ -505,7 +481,7 @@ index 974bc0ddb07..c30701b4e1f 100644
      else
          echo "Could not find an example configuration file!"
      fi
-@@ -2557,7 +2564,7 @@ grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i38
+@@ -2490,7 +2490,7 @@ grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i38
  @end group
  @end example
  
@@ -514,7 +490,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  server.
  
  The grub.cfg file is placed in the same directory as the path output by
-@@ -2760,7 +2767,7 @@ team are:
+@@ -2675,7 +2675,7 @@ team are:
  @end table
  
  To take full advantage of this function, install GRUB into the MBR
@@ -523,7 +499,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  If you have a laptop which has a similar feature and not in the above list
  could you figure your address and contribute?
-@@ -2821,7 +2828,7 @@ bytes.
+@@ -2736,7 +2736,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
@@ -532,7 +508,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  core image into @file{boot.img} when installing GRUB.
  
  @item diskboot.img
-@@ -2851,7 +2858,7 @@ images.
+@@ -2766,7 +2766,7 @@ images.
  
  @item core.img
  This is the core image of GRUB.  It is built dynamically from the kernel
@@ -541,7 +517,7 @@ index 974bc0ddb07..c30701b4e1f 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
-@@ -2903,7 +2910,7 @@ GRUB 2 has no single Stage 2 image.  Instead, it loads modules from
+@@ -2818,7 +2818,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
@@ -550,7 +526,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  @item nbgrub
  There is as yet no equivalent for @file{nbgrub} in GRUB 2; it was used by
-@@ -3071,8 +3078,8 @@ There are two ways to specify files, by @dfn{absolute file name} and by
+@@ -2974,8 +2974,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
@@ -561,7 +537,7 @@ index 974bc0ddb07..c30701b4e1f 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}),
-@@ -3080,8 +3087,8 @@ then @code{/boot/kernel} is the same as @code{(hd1,1)/boot/kernel}.
+@@ -2983,8 +2983,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}].
@@ -572,7 +548,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  @samp{snap-129}.  Trailing @samp{@@} after volume name is mandatory even if
  snapshot name is omitted.
  
-@@ -3500,7 +3507,7 @@ The more recent release of Minix would then be identified as
+@@ -3387,7 +3387,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
@@ -581,7 +557,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  
  @node fallback
-@@ -3590,7 +3597,7 @@ If this variable is set, it names the language code that the
+@@ -3477,7 +3477,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}.
  
@@ -590,7 +566,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  reasonable default for this variable based on the system locale.
  
  
-@@ -3598,10 +3605,10 @@ reasonable default for this variable based on the system locale.
+@@ -3485,10 +3485,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
@@ -603,7 +579,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  default for this variable if internationalization is needed and any
  translation files are available.
  
-@@ -3738,7 +3745,7 @@ input.  The default is not to pause output.
+@@ -3606,7 +3606,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
@@ -612,7 +588,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  dynamically loaded from this directory, so it must be set correctly in order
  for many parts of GRUB to work.
  
-@@ -3850,17 +3857,17 @@ GRUB provides an ``environment block'' which can be used to save a small
+@@ -3697,17 +3697,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
@@ -632,8 +608,8 @@ index 974bc0ddb07..c30701b4e1f 100644
 +@command{grub2-mkconfig} uses this facility to implement
  @samp{GRUB_SAVEDEFAULT} (@pxref{Simple configuration}).
  
- @node Modules
-@@ -4922,7 +4929,7 @@ Translate @var{string} into the current language.
+ 
+@@ -4398,7 +4398,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
@@ -642,7 +618,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  @end deffn
  
  
-@@ -5274,7 +5281,7 @@ Define a user named @var{user} with password @var{clear-password}.
+@@ -4793,7 +4793,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}.
@@ -651,7 +627,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  to generate password hashes.  @xref{Security}.
  @end deffn
  
-@@ -6400,8 +6407,8 @@ The @samp{password} (@pxref{password}) and @samp{password_pbkdf2}
+@@ -5651,8 +5651,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
@@ -662,7 +638,7 @@ index 974bc0ddb07..c30701b4e1f 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,
-@@ -6446,7 +6453,7 @@ menuentry "May be run by user1 or a superuser" --users user1 @{
+@@ -5696,7 +5696,7 @@ menuentry "May be run by user1 or a superuser" --users user1 @{
  @end group
  @end example
  
@@ -671,28 +647,28 @@ index 974bc0ddb07..c30701b4e1f 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}
-@@ -6472,8 +6479,18 @@ validation fails, then file @file{foo} cannot be opened.  This failure
+@@ -5721,15 +5721,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.
  
- 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}).
-+using the @code{--pubkey} option to @command{grub2-install}
-+(@pxref{Invoking grub2-install}).
-+
+-@comment Unfortunately --pubkey is not yet supported by grub-install,
+-@comment but we should not bring up internal detail grub-mkimage here
 +@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 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 @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
-@@ -6493,8 +6510,8 @@ gpg --detach-sign /path/to/file
+@@ -5749,8 +5749,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
@@ -703,7 +679,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  @example
  @group
-@@ -6516,7 +6533,7 @@ See also: @ref{check_signatures}, @ref{verify_detached}, @ref{trust},
+@@ -5772,7 +5772,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
@@ -712,16 +688,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  equal to @code{enforce} in @file{core.img} prior to processing any
  configuration files.
  
-@@ -6564,7 +6581,7 @@ UTF-8 strings as comma-separated values (CSV). See
- @uref{https://github.com/rhboot/shim/blob/main/SBAT.md} for more details.
- 
- To add a data section containing the SBAT information into the binary, the
--@option{--sbat} option of @command{grub-mkimage} command should be used. The content
-+@option{--sbat} option of @command{grub2-mkimage} command should be used. The content
- of a CSV file, encoded with UTF-8, is copied as is to the .sbat data section into
- the generated EFI binary. The CSV file can be stored anywhere on the file system.
- 
-@@ -6975,10 +6992,10 @@ Required files are:
+@@ -6189,10 +6189,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
@@ -734,7 +701,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  things GRUB is supposed to do.
  
  If, instead, you only get a rescue shell, this usually means that GRUB
-@@ -7004,8 +7021,8 @@ normal
+@@ -6218,8 +6218,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
@@ -745,7 +712,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  @itemize @bullet{}
  @item
-@@ -7017,7 +7034,7 @@ is usually better to use UUIDs or file system labels and avoid depending on
+@@ -6231,7 +6231,7 @@ is usually better to use UUIDs or file system labels and avoid depending on
  drive ordering entirely.
  
  @item
@@ -754,34 +721,14 @@ index 974bc0ddb07..c30701b4e1f 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.
  
-@@ -7052,33 +7069,33 @@ bootability on other machines.
- @chapter User-space utilities
- 
- @menu
--* Invoking grub-install::       How to use the GRUB installer
--* Invoking grub-mkconfig::      Generate a GRUB configuration file
--* Invoking grub-mkpasswd-pbkdf2::
-+* Invoking grub2-install::       How to use the GRUB installer
-+* Invoking grub2-mkconfig::      Generate a GRUB configuration file
-+* Invoking grub2-mkpasswd-pbkdf2::
-                                 Generate GRUB password hashes
--* Invoking grub-mkrelpath::     Make system path relative to its root
--* Invoking grub-mkrescue::      Make a GRUB rescue image
--* Invoking grub-mount::         Mount a file system using GRUB
--* Invoking grub-probe::         Probe device information for GRUB
--* Invoking grub-script-check::  Check GRUB script file for syntax errors
-+* Invoking grub2-mkrelpath::     Make system path relative to its root
-+* Invoking grub2-mkrescue::      Make a GRUB rescue image
-+* Invoking grub2-mount::         Mount a file system using GRUB
-+* Invoking grub2-probe::         Probe device information for GRUB
-+* Invoking grub2-script-check::  Check GRUB script file for syntax errors
- @end menu
+@@ -6262,21 +6262,21 @@ entry which claims partition start at block 0. This change will not hamper
+ bootability on other machines.
  
  
 -@node Invoking grub-install
--@section Invoking grub-install
+-@chapter Invoking grub-install
 +@node Invoking grub2-install
-+@section Invoking grub2-install
++@chapter Invoking grub2-install
  
 -The program @command{grub-install} generates a GRUB core image using
 -@command{grub-mkimage} and installs it on your system.  You must specify the
@@ -802,7 +749,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  @table @option
  @item --help
-@@ -7094,13 +7111,13 @@ separate partition or a removable disk.
+@@ -6292,13 +6292,13 @@ separate partition or a removable disk.
  If this option is not specified then it defaults to @file{/boot}, so
  
  @example
@@ -818,7 +765,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  @end example
  
  Here is an example in which you have a separate @dfn{boot} partition which is 
-@@ -7108,16 +7125,16 @@ mounted on
+@@ -6306,16 +6306,16 @@ mounted on
  @file{/mnt/boot}:
  
  @example
@@ -838,14 +785,14 @@ index 974bc0ddb07..c30701b4e1f 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
-@@ -7130,17 +7147,17 @@ installation}) where GRUB does not reside in any unpartitioned space
+@@ -6328,17 +6328,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
  
 -@node Invoking grub-mkconfig
--@section Invoking grub-mkconfig
+-@chapter Invoking grub-mkconfig
 +@node Invoking grub2-mkconfig
-+@section Invoking grub2-mkconfig
++@chapter Invoking grub2-mkconfig
  
 -The program @command{grub-mkconfig} generates a configuration file for GRUB
 +The program @command{grub2-mkconfig} generates a configuration file for GRUB
@@ -853,7 +800,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  @example
 -grub-mkconfig -o /boot/grub/grub.cfg
-+grub2-mkconfig -o /boot/grub2/grub.cfg
++grub-mkconfig -o /boot/grub2/grub.cfg
  @end example
  
 -@command{grub-mkconfig} accepts the following options:
@@ -861,22 +808,21 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  @table @option
  @item --help
-@@ -7156,17 +7173,17 @@ it to standard output.
+@@ -6354,17 +6354,17 @@ it to standard output.
  @end table
  
  
 -@node Invoking grub-mkpasswd-pbkdf2
--@section Invoking grub-mkpasswd-pbkdf2
+-@chapter Invoking grub-mkpasswd-pbkdf2
 +@node Invoking grub2-mkpasswd-pbkdf2
-+@section Invoking grub2-mkpasswd-pbkdf2
++@chapter Invoking grub2-mkpasswd-pbkdf2
  
 -The program @command{grub-mkpasswd-pbkdf2} generates password hashes for
 +The program @command{grub2-mkpasswd-pbkdf2} generates password hashes for
  GRUB (@pxref{Security}).
  
  @example
--grub-mkpasswd-pbkdf2
-+grub2-mkpasswd-pbkdf2
+ grub-mkpasswd-pbkdf2
  @end example
  
 -@command{grub-mkpasswd-pbkdf2} accepts the following options:
@@ -884,14 +830,14 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  @table @option
  @item -c @var{number}
-@@ -7184,23 +7201,23 @@ Length of the salt.  Defaults to 64.
+@@ -6382,23 +6382,23 @@ Length of the salt.  Defaults to 64.
  @end table
  
  
 -@node Invoking grub-mkrelpath
--@section Invoking grub-mkrelpath
+-@chapter Invoking grub-mkrelpath
 +@node Invoking grub2-mkrelpath
-+@section Invoking grub2-mkrelpath
++@chapter Invoking grub2-mkrelpath
  
 -The program @command{grub-mkrelpath} makes a file system path relative to
 +The program @command{grub2-mkrelpath} makes a file system path relative to
@@ -914,22 +860,21 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  @table @option
  @item --help
-@@ -7211,17 +7228,17 @@ Print the version number of GRUB and exit.
+@@ -6409,17 +6409,17 @@ Print the version number of GRUB and exit.
  @end table
  
  
 -@node Invoking grub-mkrescue
--@section Invoking grub-mkrescue
+-@chapter Invoking grub-mkrescue
 +@node Invoking grub2-mkrescue
-+@section Invoking grub2-mkrescue
++@chapter Invoking grub2-mkrescue
  
 -The program @command{grub-mkrescue} generates a bootable GRUB rescue image
 +The program @command{grub2-mkrescue} generates a bootable GRUB rescue image
  (@pxref{Making a GRUB bootable CD-ROM}).
  
  @example
--grub-mkrescue -o grub.iso
-+grub2-mkrescue -o grub.iso
+ grub-mkrescue -o grub.iso
  @end example
  
 -All arguments not explicitly listed as @command{grub-mkrescue} options are
@@ -937,12 +882,8 @@ index 974bc0ddb07..c30701b4e1f 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
-@@ -7233,10 +7250,10 @@ commonly used to add extra files to the image:
- @example
- mkdir -p disk/boot/grub
- @r{(add extra files to @file{disk/boot/grub})}
--grub-mkrescue -o grub.iso disk
-+grub2-mkrescue -o grub.iso disk
+@@ -6434,7 +6434,7 @@ mkdir -p disk/boot/grub
+ grub-mkrescue -o grub.iso disk
  @end example
  
 -@command{grub-mkrescue} accepts the following options:
@@ -950,7 +891,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  @table @option
  @item --help
-@@ -7264,15 +7281,15 @@ Use @var{file} as the @command{xorriso} program, rather than the built-in
+@@ -6462,15 +6462,15 @@ Use @var{file} as the @command{xorriso} program, rather than the built-in
  default.
  
  @item --grub-mkimage=@var{file}
@@ -961,16 +902,16 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  
 -@node Invoking grub-mount
--@section Invoking grub-mount
+-@chapter Invoking grub-mount
 +@node Invoking grub2-mount
-+@section Invoking grub2-mount
++@chapter Invoking grub2-mount
  
 -The program @command{grub-mount} performs a read-only mount of any file
 +The program @command{grub2-mount} performs a read-only mount of any file
  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:
-@@ -7304,13 +7321,13 @@ even if nobody has yet written a FUSE module specifically for that file
+@@ -6502,13 +6502,13 @@ even if nobody has yet written a FUSE module specifically for that file
  system type.
  @end itemize
  
@@ -978,8 +919,7 @@ index 974bc0ddb07..c30701b4e1f 100644
 +Using @command{grub2-mount} is normally as simple as:
  
  @example
--grub-mount /dev/sda1 /mnt
-+grub2-mount /dev/sda1 /mnt
+ grub-mount /dev/sda1 /mnt
  @end example
  
 -@command{grub-mount} must be given one or more images and a mount point as
@@ -987,7 +927,7 @@ index 974bc0ddb07..c30701b4e1f 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:
  
-@@ -7332,13 +7349,13 @@ Show debugging output for conditions matching @var{string}.
+@@ -6530,13 +6530,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,
@@ -1003,33 +943,22 @@ index 974bc0ddb07..c30701b4e1f 100644
  root of the supplied file system.
  
  If @var{device} is just a number, then it will be treated as a partition
-@@ -7347,7 +7364,7 @@ an entire disk in @file{disk.img}, then you can use this command to mount
- its second partition:
- 
- @example
--grub-mount -r 2 disk.img mount-point
-+grub2-mount -r 2 disk.img mount-point
- @end example
- 
- @item -v
-@@ -7356,18 +7373,18 @@ Print verbose messages.
+@@ -6554,10 +6554,10 @@ Print verbose messages.
  @end table
  
  
 -@node Invoking grub-probe
--@section Invoking grub-probe
+-@chapter Invoking grub-probe
 +@node Invoking grub2-probe
-+@section Invoking grub2-probe
++@chapter Invoking grub2-probe
  
 -The program @command{grub-probe} probes device information for a given path
 +The program @command{grub2-probe} probes device information for a given path
  or device.
  
  @example
--grub-probe --target=fs /boot/grub
--grub-probe --target=drive --device /dev/sda1
-+grub2-probe --target=fs /boot/grub
-+grub2-probe --target=drive --device /dev/sda1
+@@ -6565,7 +6565,7 @@ grub-probe --target=fs /boot/grub
+ grub-probe --target=drive --device /dev/sda1
  @end example
  
 -@command{grub-probe} must be given a path or device as a non-option
@@ -1037,7 +966,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  argument, and also accepts the following options:
  
  @table @option
-@@ -7380,16 +7397,16 @@ Print the version number of GRUB and exit.
+@@ -6578,16 +6578,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
@@ -1057,14 +986,14 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  @item -t @var{target}
  @itemx --target=@var{target}
-@@ -7442,19 +7459,19 @@ Print verbose messages.
+@@ -6640,19 +6640,19 @@ Print verbose messages.
  @end table
  
  
 -@node Invoking grub-script-check
--@section Invoking grub-script-check
+-@chapter Invoking grub-script-check
 +@node Invoking grub2-script-check
-+@section Invoking grub2-script-check
++@chapter Invoking grub2-script-check
  
 -The program @command{grub-script-check} takes a GRUB script file
 +The program @command{grub2-script-check} takes a GRUB script file
@@ -1074,7 +1003,7 @@ index 974bc0ddb07..c30701b4e1f 100644
  
  @example
 -grub-script-check /boot/grub/grub.cfg
-+grub2-script-check /boot/grub2/grub.cfg
++grub-script-check /boot/grub2/grub.cfg
  @end example
  
 -@command{grub-script-check} accepts the following options:

0072-print-more-debug-info-in-our-module-loader.patch

@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 1 May 2017 11:19:40 -0400
+Subject: [PATCH] print more debug info in our module loader.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/kern/efi/efi.c | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
+index 370ce03c5d7..a1af9b46559 100644
+--- a/grub-core/kern/efi/efi.c
++++ b/grub-core/kern/efi/efi.c
+@@ -313,13 +313,23 @@ grub_efi_modules_addr (void)
+     }
+ 
+   if (i == coff_header->num_sections)
+-    return 0;
++    {
++      grub_dprintf("sections", "section %d is last section; invalid.\n", i);
++      return 0;
++    }
+ 
+   info = (struct grub_module_info *) ((char *) image->image_base
+ 				      + section->virtual_address);
+-  if (info->magic != GRUB_MODULE_MAGIC)
+-    return 0;
++  if (section->name[0] != '.' && info->magic != GRUB_MODULE_MAGIC)
++    {
++      grub_dprintf("sections",
++		   "section %d has bad magic %08x, should be %08x\n",
++		   i, info->magic, GRUB_MODULE_MAGIC);
++      return 0;
++    }
+ 
++  grub_dprintf("sections", "returning section info for section %d: \"%s\"\n",
++	       i, section->name);
+   return (grub_addr_t) info;
+ }
+ 

0073-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 f300e46fc6a..d7d423b2eaf 100644
+index 9b8f5968e2d..13a3a6bc752 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 f300e46fc6a..d7d423b2eaf 100644
  }
  EOF
  }
-@@ -296,11 +253,12 @@ EOF
+@@ -284,11 +241,12 @@ EOF
        echo "$title_correction_code"
      ;;
      macosx)

0074-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch

@@ -19,12 +19,12 @@ variable and loading the config file from the subvolume.
 
 Signed-off-by: Jeff Mahoney <jeffm@suse.com>
 ---
- grub-core/fs/btrfs.c | 558 ++++++++++++++++++++++++++++++++++++++++++++++++---
+ grub-core/fs/btrfs.c | 552 +++++++++++++++++++++++++++++++++++++++++++++++++--
  include/grub/btrfs.h |   1 +
- 2 files changed, 536 insertions(+), 23 deletions(-)
+ 2 files changed, 533 insertions(+), 20 deletions(-)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index ba0c583526d..f14fe9c1bda 100644
+index 48bd3d04a5e..6823d9765c4 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
 @@ -38,6 +38,9 @@
@@ -36,8 +36,8 @@ index ba0c583526d..f14fe9c1bda 100644
 +#include <grub/extcmd.h>
  #include <grub/crypto.h>
  #include <grub/diskfilter.h>
- #include <grub/safemath.h>
-@@ -79,9 +82,11 @@ struct grub_btrfs_superblock
+ 
+@@ -78,9 +81,11 @@ struct grub_btrfs_superblock
    grub_uint64_t generation;
    grub_uint64_t root_tree;
    grub_uint64_t chunk_tree;
@@ -51,7 +51,7 @@ index ba0c583526d..f14fe9c1bda 100644
    struct grub_btrfs_device this_device;
    char label[0x100];
    grub_uint8_t dummy4[0x100];
-@@ -121,6 +126,7 @@ struct grub_btrfs_data
+@@ -120,6 +125,7 @@ struct grub_btrfs_data
    grub_uint64_t exttree;
    grub_size_t extsize;
    struct grub_btrfs_extent_data *extent;
@@ -59,7 +59,7 @@ index ba0c583526d..f14fe9c1bda 100644
  };
  
  struct grub_btrfs_chunk_item
-@@ -191,6 +197,14 @@ struct grub_btrfs_leaf_descriptor
+@@ -188,6 +194,14 @@ struct grub_btrfs_leaf_descriptor
    } *data;
  };
  
@@ -74,7 +74,7 @@ index ba0c583526d..f14fe9c1bda 100644
  struct grub_btrfs_time
  {
    grub_int64_t sec;
-@@ -236,6 +250,14 @@ struct grub_btrfs_extent_data
+@@ -233,6 +247,14 @@ struct grub_btrfs_extent_data
  
  #define GRUB_BTRFS_OBJECT_ID_CHUNK 0x100
  
@@ -89,7 +89,7 @@ index ba0c583526d..f14fe9c1bda 100644
  static grub_disk_addr_t superblock_sectors[] = { 64 * 2, 64 * 1024 * 2,
    256 * 1048576 * 2, 1048576ULL * 1048576ULL * 2
  };
-@@ -1252,6 +1274,62 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
+@@ -1153,6 +1175,62 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
    return GRUB_ERR_NONE;
  }
  
@@ -152,7 +152,7 @@ index ba0c583526d..f14fe9c1bda 100644
  static struct grub_btrfs_data *
  grub_btrfs_mount (grub_device_t dev)
  {
-@@ -1287,6 +1365,13 @@ grub_btrfs_mount (grub_device_t dev)
+@@ -1188,6 +1266,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 ba0c583526d..f14fe9c1bda 100644
    return data;
  }
  
-@@ -1784,6 +1869,91 @@ get_root (struct grub_btrfs_data *data, struct grub_btrfs_key *key,
+@@ -1653,6 +1738,91 @@ get_root (struct grub_btrfs_data *data, struct grub_btrfs_key *key,
    return GRUB_ERR_NONE;
  }
  
@@ -258,7 +258,7 @@ index ba0c583526d..f14fe9c1bda 100644
  static grub_err_t
  find_path (struct grub_btrfs_data *data,
  	   const char *path, struct grub_btrfs_key *key,
-@@ -1802,14 +1972,26 @@ find_path (struct grub_btrfs_data *data,
+@@ -1671,14 +1841,26 @@ find_path (struct grub_btrfs_data *data,
    char *origpath = NULL;
    unsigned symlinks_max = 32;
  
@@ -289,18 +289,15 @@ index ba0c583526d..f14fe9c1bda 100644
    while (1)
      {
        while (path[0] == '/')
-@@ -1982,13 +2164,25 @@ find_path (struct grub_btrfs_data *data,
+@@ -1851,9 +2033,21 @@ find_path (struct grub_btrfs_data *data,
  	  path = path_alloc = tmp;
  	  if (path[0] == '/')
  	    {
 -	      err = get_root (data, key, tree, type);
 -	      if (err)
+-		return err;
 +	      if (data->fs_tree)
- 		{
--		  grub_free (direl);
--		  grub_free (path_alloc);
--		  grub_free (origpath);
--		  return err;
++		{
 +		  *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
 +		  *tree = data->fs_tree;
 +		  /* This is a tree root, so everything starts at objectid 256 */
@@ -312,16 +309,12 @@ index ba0c583526d..f14fe9c1bda 100644
 +		{
 +		  err = get_root (data, key, tree, type);
 +		  if (err)
-+                    {
-+                      grub_free (direl);
-+                      grub_free (path_alloc);
-+                      grub_free (origpath);
-+                      return err;
-+                    }
- 		}
++		    return err;
++		}
  	    }
  	  continue;
-@@ -2256,18 +2450,10 @@ grub_btrfs_read (grub_file_t file, char *buf, grub_size_t len)
+ 	}
+@@ -2094,18 +2288,10 @@ grub_btrfs_read (grub_file_t file, char *buf, grub_size_t len)
  				 data->tree, file->offset, buf, len);
  }
  
@@ -343,7 +336,7 @@ index ba0c583526d..f14fe9c1bda 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]),
-@@ -2276,6 +2462,20 @@ grub_btrfs_uuid (grub_device_t device, char **uuid)
+@@ -2114,6 +2300,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]));
@@ -364,7 +357,7 @@ index ba0c583526d..f14fe9c1bda 100644
  
    grub_btrfs_unmount (data);
  
-@@ -2396,6 +2596,242 @@ grub_btrfs_embed (grub_device_t device __attribute__ ((unused)),
+@@ -2170,6 +2370,242 @@ grub_btrfs_embed (grub_device_t device __attribute__ ((unused)),
  }
  #endif
  
@@ -607,7 +600,7 @@ index ba0c583526d..f14fe9c1bda 100644
  static struct grub_fs grub_btrfs_fs = {
    .name = "btrfs",
    .fs_dir = grub_btrfs_dir,
-@@ -2411,12 +2847,88 @@ static struct grub_fs grub_btrfs_fs = {
+@@ -2185,12 +2621,88 @@ static struct grub_fs grub_btrfs_fs = {
  #endif
  };
  

0075-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 8e2b1e9f7bc..14e38a4df02 100644
+index 6823d9765c4..2d099b18ea1 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
-@@ -2920,6 +2920,8 @@ GRUB_MOD_INIT (btrfs)
+@@ -2694,6 +2694,8 @@ GRUB_MOD_INIT (btrfs)
                                 subvol_set_env);
    grub_register_variable_hook ("btrfs_subvolid", subvolid_get_env,
                                 subvolid_set_env);

0076-grub2-btrfs-03-follow_default.patch

@@ -3,17 +3,15 @@ From: Michael Chang <mchang@suse.com>
 Date: Thu, 21 Aug 2014 03:39:11 +0000
 Subject: [PATCH] grub2-btrfs-03-follow_default
 
-Signed-off-by: Michael Chang <mchang@suse.com>
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/fs/btrfs.c | 107 ++++++++++++++++++++++++++++++++++++---------------
  1 file changed, 76 insertions(+), 31 deletions(-)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 14e38a4df02..d47f9ab0352 100644
+index 2d099b18ea1..2db89f71ea5 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
-@@ -1335,6 +1335,7 @@ grub_btrfs_mount (grub_device_t dev)
+@@ -1236,6 +1236,7 @@ grub_btrfs_mount (grub_device_t dev)
  {
    struct grub_btrfs_data *data;
    grub_err_t err;
@@ -21,7 +19,7 @@ index 14e38a4df02..d47f9ab0352 100644
  
    if (!dev->disk)
      {
-@@ -1365,11 +1366,14 @@ grub_btrfs_mount (grub_device_t dev)
+@@ -1266,11 +1267,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;
  
@@ -40,7 +38,7 @@ index 14e38a4df02..d47f9ab0352 100644
      }
  
    return data;
-@@ -1966,24 +1970,39 @@ find_path (struct grub_btrfs_data *data,
+@@ -1835,24 +1839,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;
@@ -87,7 +85,7 @@ index 14e38a4df02..d47f9ab0352 100644
      }
    else
      {
-@@ -1994,15 +2013,23 @@ find_path (struct grub_btrfs_data *data,
+@@ -1863,15 +1882,23 @@ find_path (struct grub_btrfs_data *data,
  
    while (1)
      {
@@ -120,7 +118,7 @@ index 14e38a4df02..d47f9ab0352 100644
  
        if (*type != GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY)
  	{
-@@ -2013,7 +2040,9 @@ find_path (struct grub_btrfs_data *data,
+@@ -1882,7 +1909,9 @@ find_path (struct grub_btrfs_data *data,
  
        if (ctokenlen == 1 && ctoken[0] == '.')
  	{
@@ -131,7 +129,7 @@ index 14e38a4df02..d47f9ab0352 100644
  	  continue;
  	}
        if (ctokenlen == 2 && ctoken[0] == '.' && ctoken[1] == '.')
-@@ -2044,8 +2073,9 @@ find_path (struct grub_btrfs_data *data,
+@@ -1913,8 +1942,9 @@ find_path (struct grub_btrfs_data *data,
  	  *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
  	  key->object_id = key_out.offset;
  
@@ -143,7 +141,7 @@ index 14e38a4df02..d47f9ab0352 100644
  	  continue;
  	}
  
-@@ -2114,7 +2144,9 @@ find_path (struct grub_btrfs_data *data,
+@@ -1983,7 +2013,9 @@ find_path (struct grub_btrfs_data *data,
  	  return err;
  	}
  
@@ -154,7 +152,7 @@ index 14e38a4df02..d47f9ab0352 100644
        if (cdirel->type == GRUB_BTRFS_DIR_ITEM_TYPE_SYMLINK)
  	{
  	  struct grub_btrfs_inode inode;
-@@ -2164,14 +2196,26 @@ find_path (struct grub_btrfs_data *data,
+@@ -2033,14 +2065,26 @@ find_path (struct grub_btrfs_data *data,
  	  path = path_alloc = tmp;
  	  if (path[0] == '/')
  	    {
@@ -188,7 +186,7 @@ index 14e38a4df02..d47f9ab0352 100644
  		}
  	      else
  		{
-@@ -2922,6 +2966,7 @@ GRUB_MOD_INIT (btrfs)
+@@ -2696,6 +2740,7 @@ GRUB_MOD_INIT (btrfs)
                                 subvolid_set_env);
    grub_env_export ("btrfs_subvol");
    grub_env_export ("btrfs_subvolid");

0077-grub2-btrfs-04-grub2-install.patch

@@ -3,22 +3,20 @@ From: Michael Chang <mchang@suse.com>
 Date: Thu, 21 Aug 2014 03:39:11 +0000
 Subject: [PATCH] grub2-btrfs-04-grub2-install
 
-Signed-off-by: Michael Chang <mchang@suse.com>
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/osdep/linux/getroot.c |  7 +++++++
  grub-core/osdep/unix/config.c   | 17 +++++++++++++++--
  util/config.c                   | 10 ++++++++++
- util/grub-install.c             | 14 ++++++++++++++
+ util/grub-install.c             | 15 +++++++++++++++
  util/grub-mkrelpath.c           |  6 ++++++
  include/grub/emu/config.h       |  1 +
- 6 files changed, 53 insertions(+), 2 deletions(-)
+ 6 files changed, 54 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 7dd775d2ad9..7c29b3523b4 100644
+index 6d9f4e5faa2..5d50dd6f8dc 100644
 --- a/grub-core/osdep/linux/getroot.c
 +++ b/grub-core/osdep/linux/getroot.c
-@@ -373,6 +373,7 @@ get_btrfs_fs_prefix (const char *mount_path)
+@@ -376,6 +376,7 @@ get_btrfs_fs_prefix (const char *mount_path)
    return NULL;
  }
  
@@ -26,7 +24,7 @@ index 7dd775d2ad9..7c29b3523b4 100644
  
  char **
  grub_find_root_devices_from_mountinfo (const char *dir, char **relroot)
-@@ -516,6 +517,12 @@ again:
+@@ -519,6 +520,12 @@ again:
  	{
  	  ret = grub_find_root_devices_from_btrfs (dir);
  	  fs_prefix = get_btrfs_fs_prefix (entries[i].enc_path);
@@ -40,7 +38,7 @@ index 7dd775d2ad9..7c29b3523b4 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 0b1f7618d21..0ce0e309ac0 100644
+index 65effa9f3a7..b637c58efb7 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)
@@ -96,19 +94,19 @@ index ebcdd8f5e22..f044a880a76 100644
  			sizeof ("GRUB_DISTRIBUTOR=") - 1) == 0)
  	{
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 7dc5657bb67..ec3ed49674b 100644
+index 8a55ad4b8dc..0e807b09c36 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
-@@ -843,6 +843,8 @@ try_open (const char *path)
+@@ -819,6 +819,8 @@ fill_core_services (const char *core_services)
+   free (sysv_plist);
  }
- #endif
  
 +extern int use_relative_path_on_btrfs;
 +
  int
  main (int argc, char *argv[])
  {
-@@ -876,6 +878,9 @@ main (int argc, char *argv[])
+@@ -852,6 +854,9 @@ main (int argc, char *argv[])
  
    grub_util_load_config (&config);
  
@@ -118,10 +116,11 @@ index 7dc5657bb67..ec3ed49674b 100644
    if (!bootloader_id && config.grub_distributor)
      {
        char *ptr;
-@@ -1366,6 +1371,15 @@ main (int argc, char *argv[])
-       relative_grubdir = xstrdup ("/");
+@@ -1344,6 +1349,16 @@ main (int argc, char *argv[])
+       fprintf (load_cfg_f, "set debug='%s'\n",
+ 	      debug_image);
      }
- 
++
 +  if (config.is_suse_btrfs_snapshot_enabled
 +      && grub_strncmp(grub_fs->name, "btrfs", sizeof ("btrfs") - 1) == 0)
 +    {

0078-grub2-btrfs-05-grub2-mkconfig.patch

@@ -13,10 +13,10 @@ Signed-off-by: Michael Chang <mchang@suse.com>
  5 files changed, 38 insertions(+), 2 deletions(-)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 28e92515795..884e4d363ca 100644
+index 6247a0ba850..4649e92eb0f 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -256,7 +256,8 @@ export GRUB_DEFAULT \
+@@ -258,7 +258,8 @@ export GRUB_DEFAULT \
    GRUB_BADRAM \
    GRUB_OS_PROBER_SKIP_LIST \
    GRUB_DISABLE_SUBMENU \
@@ -27,10 +27,10 @@ index 28e92515795..884e4d363ca 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 33e1750aebb..0ba0e0e1c65 100644
+index 113a41f9409..b3aae534ddc 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
-@@ -49,7 +49,11 @@ grub_warn ()
+@@ -52,7 +52,11 @@ grub_warn ()
  
  make_system_path_relative_to_its_root ()
  {
@@ -43,7 +43,7 @@ index 33e1750aebb..0ba0e0e1c65 100644
  
  is_path_readable_by_grub ()
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index c2d8b093762..3e1b77265db 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@"
@@ -90,10 +90,10 @@ index c2d8b093762..3e1b77265db 100644
 +EOF
 +fi
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index e8ab4082f87..48ff32c1da4 100644
+index 55f4aa783cf..5cab299dc08 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -68,10 +68,14 @@ fi
+@@ -66,10 +66,14 @@ fi
  
  case x"$GRUB_FS" in
      xbtrfs)
@@ -109,10 +109,10 @@ index e8ab4082f87..48ff32c1da4 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 98ee5bc58dc..efcded0fbb4 100644
+index 47e0d3f5cd6..1519ec692fe 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
-@@ -75,10 +75,14 @@ fi
+@@ -73,10 +73,14 @@ fi
  
  case x"$GRUB_FS" in
      xbtrfs)

0079-grub2-btrfs-06-subvol-mount.patch

@@ -3,8 +3,6 @@ From: Michael Chang <mchang@suse.com>
 Date: Tue, 9 Jul 2019 13:56:16 +0200
 Subject: [PATCH] grub2-btrfs-06-subvol-mount
 
-Signed-off-by: Michael Chang <mchang@suse.com>
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/fs/btrfs.c            | 195 +++++++++++++++++++++++++++++++++++++++-
  grub-core/osdep/linux/getroot.c | 148 +++++++++++++++++++++++++++++-
@@ -13,7 +11,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  4 files changed, 392 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index d47f9ab0352..d44a1c73b8a 100644
+index 2db89f71ea5..162723423ca 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
 @@ -41,6 +41,7 @@
@@ -23,8 +21,8 @@ index d47f9ab0352..d44a1c73b8a 100644
 +#include <grub/list.h>
  #include <grub/crypto.h>
  #include <grub/diskfilter.h>
- #include <grub/safemath.h>
-@@ -266,6 +267,12 @@ static grub_err_t
+ 
+@@ -263,6 +264,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);
@@ -37,7 +35,7 @@ index d47f9ab0352..d44a1c73b8a 100644
  
  static grub_err_t
  read_sblock (grub_disk_t disk, struct grub_btrfs_superblock *sb)
-@@ -1302,9 +1309,26 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
+@@ -1203,9 +1210,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;
@@ -64,10 +62,10 @@ index d47f9ab0352..d44a1c73b8a 100644
    if (err)
        return grub_error(GRUB_ERR_FILE_NOT_FOUND, "couldn't locate %s\n", path);
  
-@@ -2316,11 +2340,20 @@ grub_btrfs_dir (grub_device_t device, const char *path,
+@@ -2179,11 +2203,20 @@ grub_btrfs_dir (grub_device_t device, const char *path,
+   int r = 0;
    grub_uint64_t tree;
    grub_uint8_t type;
-   grub_size_t est_size = 0;
 +  char *new_path = NULL;
  
    if (!data)
@@ -86,7 +84,7 @@ index d47f9ab0352..d44a1c73b8a 100644
    if (err)
      {
        grub_btrfs_unmount (data);
-@@ -2447,11 +2480,21 @@ grub_btrfs_open (struct grub_file *file, const char *name)
+@@ -2285,11 +2318,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;
@@ -109,7 +107,7 @@ index d47f9ab0352..d44a1c73b8a 100644
    if (err)
      {
        grub_btrfs_unmount (data);
-@@ -2686,6 +2729,150 @@ grub_cmd_btrfs_info (grub_command_t cmd __attribute__ ((unused)), int argc,
+@@ -2460,6 +2503,150 @@ grub_cmd_btrfs_info (grub_command_t cmd __attribute__ ((unused)), int argc,
    return 0;
  }
  
@@ -260,7 +258,7 @@ index d47f9ab0352..d44a1c73b8a 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,
-@@ -2892,6 +3079,7 @@ static struct grub_fs grub_btrfs_fs = {
+@@ -2666,6 +2853,7 @@ static struct grub_fs grub_btrfs_fs = {
  };
  
  static grub_command_t cmd_info;
@@ -268,7 +266,7 @@ index d47f9ab0352..d44a1c73b8a 100644
  static grub_extcmd_t cmd_list_subvols;
  
  static char *
-@@ -2955,6 +3143,9 @@ GRUB_MOD_INIT (btrfs)
+@@ -2729,6 +2917,9 @@ GRUB_MOD_INIT (btrfs)
    cmd_info = grub_register_command("btrfs-info", grub_cmd_btrfs_info,
  				   "DEVICE",
  				   "Print BtrFS info about DEVICE.");
@@ -279,10 +277,10 @@ index d47f9ab0352..d44a1c73b8a 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 7c29b3523b4..74a48c03026 100644
+index 5d50dd6f8dc..4c5a13022dc 100644
 --- a/grub-core/osdep/linux/getroot.c
 +++ b/grub-core/osdep/linux/getroot.c
-@@ -103,6 +103,14 @@ struct btrfs_ioctl_search_key
+@@ -107,6 +107,14 @@ struct btrfs_ioctl_search_key
    grub_uint32_t unused[9];
  };
  
@@ -297,7 +295,7 @@ index 7c29b3523b4..74a48c03026 100644
  struct btrfs_ioctl_search_args {
    struct btrfs_ioctl_search_key key;
    grub_uint64_t buf[(4096 - sizeof(struct btrfs_ioctl_search_key))
-@@ -375,6 +383,109 @@ get_btrfs_fs_prefix (const char *mount_path)
+@@ -378,6 +386,109 @@ get_btrfs_fs_prefix (const char *mount_path)
  
  int use_relative_path_on_btrfs = 0;
  
@@ -407,7 +405,7 @@ index 7c29b3523b4..74a48c03026 100644
  char **
  grub_find_root_devices_from_mountinfo (const char *dir, char **relroot)
  {
-@@ -516,12 +627,15 @@ again:
+@@ -519,12 +630,15 @@ again:
        else if (grub_strcmp (entries[i].fstype, "btrfs") == 0)
  	{
  	  ret = grub_find_root_devices_from_btrfs (dir);
@@ -426,7 +424,7 @@ index 7c29b3523b4..74a48c03026 100644
  	    }
  	}
        else if (!retry && grub_strcmp (entries[i].fstype, "autofs") == 0)
-@@ -1147,6 +1261,34 @@ grub_util_get_grub_dev_os (const char *os_dev)
+@@ -1150,6 +1264,34 @@ grub_util_get_grub_dev_os (const char *os_dev)
    return grub_dev;
  }
  
@@ -462,10 +460,10 @@ index 7c29b3523b4..74a48c03026 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 ec3ed49674b..d3ec2570d1d 100644
+index 0e807b09c36..3e718b9e3fb 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
-@@ -1615,6 +1615,55 @@ main (int argc, char *argv[])
+@@ -1561,6 +1561,55 @@ main (int argc, char *argv[])
        prefix_drive = xasprintf ("(%s)", grub_drives[0]);
      }
  

0080-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 d44a1c73b8a..dba86d19b1a 100644
+index 162723423ca..69c30e62354 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
-@@ -1339,11 +1339,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
+@@ -1240,11 +1240,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
    return GRUB_ERR_NONE;
  }
  

0081-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch

@@ -3,17 +3,15 @@ From: Michael Chang <mchang@suse.com>
 Date: Thu, 11 May 2017 08:56:57 +0000
 Subject: [PATCH] Grub not working correctly with btrfs snapshots (bsc#1026511)
 
-Signed-off-by: Michael Chang <mchang@suse.com>
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/fs/btrfs.c | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 238 insertions(+)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index dba86d19b1a..87e4dd1a07a 100644
+index 69c30e62354..ba99d04f8ed 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
-@@ -3093,6 +3093,238 @@ out:
+@@ -2867,6 +2867,238 @@ out:
    return 0;
  }
  
@@ -252,7 +250,7 @@ index dba86d19b1a..87e4dd1a07a 100644
  static struct grub_fs grub_btrfs_fs = {
    .name = "btrfs",
    .fs_dir = grub_btrfs_dir,
-@@ -3111,6 +3343,7 @@ static struct grub_fs grub_btrfs_fs = {
+@@ -2885,6 +3117,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;
@@ -260,7 +258,7 @@ index dba86d19b1a..87e4dd1a07a 100644
  
  static char *
  subvolid_set_env (struct grub_env_var *var __attribute__ ((unused)),
-@@ -3181,6 +3414,11 @@ GRUB_MOD_INIT (btrfs)
+@@ -2955,6 +3188,11 @@ GRUB_MOD_INIT (btrfs)
  					 "[-p|-n] [-o var] DEVICE",
  					 "Print list of BtrFS subvolumes on "
  					 "DEVICE.", options);

0082-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch

@@ -10,21 +10,21 @@ 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 a5cd99e5afa..8d98203a784 100644
+index 090c8621066..5e2b479daec 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
-@@ -36,6 +36,10 @@ struct linux_arch_kernel_header {
-   struct grub_pe_image_header pe_image_header;
- };
+@@ -24,6 +24,10 @@
+ #include <grub/dl.h>
+ #include <grub/efi/api.h>
  
 +/* Variables.  */
 +extern grub_efi_system_table_t *EXPORT_VAR(grub_efi_system_table);
 +extern grub_efi_handle_t EXPORT_VAR(grub_efi_image_handle);
 +
  /* Functions.  */
- void *EXPORT_FUNC(grub_efi_locate_protocol) (grub_guid_t *protocol,
+ void *EXPORT_FUNC(grub_efi_locate_protocol) (grub_efi_guid_t *protocol,
  					     void *registration);
-@@ -71,6 +75,33 @@ EXPORT_FUNC(grub_efi_get_memory_map) (grub_efi_uintn_t *memory_map_size,
+@@ -60,6 +64,33 @@ EXPORT_FUNC(grub_efi_get_memory_map) (grub_efi_uintn_t *memory_map_size,
  				      grub_efi_uintn_t *descriptor_size,
  				      grub_efi_uint32_t *descriptor_version);
  void grub_efi_memory_fini (void);
@@ -39,7 +39,7 @@ index a5cd99e5afa..8d98203a784 100644
 +  grub_efi_status_t status;
 +
 +  b = grub_efi_system_table->boot_services;
-+  status = b->allocate_pool(pool_type, buffer_size, buffer);
++  status = efi_call_3 (b->allocate_pool, pool_type, buffer_size, buffer);
 +  return status;
 +}
 +
@@ -51,14 +51,14 @@ index a5cd99e5afa..8d98203a784 100644
 +  grub_efi_status_t status;
 +
 +  b = grub_efi_system_table->boot_services;
-+  status = b->free_pool(buffer);
++  status = efi_call_1 (b->free_pool, buffer);
 +  return status;
 +}
 +
  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);
-@@ -140,10 +171,7 @@ void grub_efi_init (void);
+@@ -109,10 +140,7 @@ void grub_efi_init (void);
  void grub_efi_fini (void);
  void grub_efi_set_prefix (void);
  

0083-Use-grub_efi_.-memory-helpers-where-reasonable.patch

@@ -0,0 +1,106 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 1 Jun 2017 10:06:38 -0400
+Subject: [PATCH] Use grub_efi_...() memory helpers where reasonable.
+
+This uses grub_efi_allocate_pool(), grub_efi_free_pool(), and
+grub_efi_free_pages() instead of open-coded efi_call_N() calls, so we
+get more reasonable type checking.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/loader/efi/chainloader.c | 24 +++++++++---------------
+ 1 file changed, 9 insertions(+), 15 deletions(-)
+
+diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
+index 5aa3a5dc7dd..3a724a9fcbf 100644
+--- a/grub-core/loader/efi/chainloader.c
++++ b/grub-core/loader/efi/chainloader.c
+@@ -65,7 +65,7 @@ grub_chainloader_unload (void)
+ 
+   b = grub_efi_system_table->boot_services;
+   efi_call_1 (b->unload_image, image_handle);
+-  efi_call_2 (b->free_pages, address, pages);
++  grub_efi_free_pages (address, pages);
+ 
+   grub_free (file_path);
+   grub_free (cmdline);
+@@ -108,7 +108,7 @@ grub_chainloader_boot (void)
+     }
+ 
+   if (exit_data)
+-    efi_call_1 (b->free_pool, exit_data);
++    grub_efi_free_pool (exit_data);
+ 
+   grub_loader_unset ();
+ 
+@@ -506,10 +506,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)
+ {
+-  grub_efi_boot_services_t *b;
+   grub_efi_loaded_image_t *li, li_bak;
+   grub_efi_status_t efi_status;
+-  char *buffer = NULL;
++  void *buffer = NULL;
+   char *buffer_aligned = NULL;
+   grub_efi_uint32_t i;
+   struct grub_pe32_section_table *section;
+@@ -520,8 +519,6 @@ handle_image (void *data, grub_efi_uint32_t datasize)
+   int found_entry_point = 0;
+   int rc;
+ 
+-  b = grub_efi_system_table->boot_services;
+-
+   rc = read_header (data, datasize, &context);
+   if (rc < 0)
+     {
+@@ -561,8 +558,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);
+ 
+-  efi_status = efi_call_3 (b->allocate_pool, GRUB_EFI_LOADER_DATA,
+-			   buffer_size, &buffer);
++  efi_status = grub_efi_allocate_pool (GRUB_EFI_LOADER_DATA, buffer_size,
++				       &buffer);
+ 
+   if (efi_status != GRUB_EFI_SUCCESS)
+     {
+@@ -794,14 +791,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));
+-  efi_status = efi_call_1 (b->free_pool, buffer);
++  efi_status = grub_efi_free_pool (buffer);
+ 
+   return 1;
+ 
+ error_exit:
+   grub_dprintf ("chain", "error_exit: grub_errno: %d\n", grub_errno);
+   if (buffer)
+-      efi_call_1 (b->free_pool, buffer);
++    grub_efi_free_pool (buffer);
+ 
+   return 0;
+ }
+@@ -809,10 +806,7 @@ error_exit:
+ static grub_err_t
+ grub_secureboot_chainloader_unload (void)
+ {
+-  grub_efi_boot_services_t *b;
+-
+-  b = grub_efi_system_table->boot_services;
+-  efi_call_2 (b->free_pages, address, pages);
++  grub_efi_free_pages (address, pages);
+   grub_free (file_path);
+   grub_free (cmdline);
+   cmdline = 0;
+@@ -1079,7 +1073,7 @@ fail:
+   grub_free (file_path);
+ 
+   if (address)
+-    efi_call_2 (b->free_pages, address, pages);
++    grub_efi_free_pages (address, pages);
+ 
+   if (cmdline)
+     grub_free (cmdline);

0084-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch

@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 1 Jun 2017 10:07:50 -0400
+Subject: [PATCH] Add PRIxGRUB_EFI_STATUS and use it.
+
+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(-)
+
+diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
+index 3a724a9fcbf..f4ddbeda687 100644
+--- a/grub-core/loader/efi/chainloader.c
++++ b/grub-core/loader/efi/chainloader.c
+@@ -789,7 +789,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);
+ 
+-  grub_dprintf ("chain", "entry_point returned %ld\n", efi_status);
++  grub_dprintf ("chain", "entry_point returned 0x%"PRIxGRUB_EFI_STATUS"\n",
++		efi_status);
+   grub_memcpy (li, &li_bak, sizeof (grub_efi_loaded_image_t));
+   efi_status = grub_efi_free_pool (buffer);
+ 
+diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
+index d97cdf98c80..955973ed484 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;
+ typedef grub_uint16_t grub_efi_char16_t;
+ 
+ typedef grub_efi_intn_t grub_efi_status_t;
++/* Make grub_efi_status_t reasonably printable. */
++#if GRUB_CPU_SIZEOF_VOID_P == 8
++#define PRIxGRUB_EFI_STATUS "lx"
++#define PRIdGRUB_EFI_STATUS "ld"
++#else
++#define PRIxGRUB_EFI_STATUS "llx"
++#define PRIdGRUB_EFI_STATUS "lld"
++#endif
+ 
+ #define GRUB_EFI_ERROR_CODE(value)	\
+   ((((grub_efi_status_t) 1) << (sizeof (grub_efi_status_t) * 8 - 1)) | (value))

0085-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch

@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 26 Jun 2017 12:42:57 -0400
+Subject: [PATCH] Don't use dynamic sized arrays since we don't build with
+ -std=c99
+
+---
+ grub-core/net/net.c | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/grub-core/net/net.c b/grub-core/net/net.c
+index f24f1fd63f6..5366e443d2a 100644
+--- a/grub-core/net/net.c
++++ b/grub-core/net/net.c
+@@ -1853,14 +1853,25 @@ grub_net_search_configfile (char *config)
+     {
+       /* 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),
++      char *client_uuid_var;
++      grub_size_t client_uuid_var_size;
++
++      client_uuid_var_size = grub_snprintf (NULL, 0,
++                     "net_%s_clientuuid", inf->name);
++      if (client_uuid_var_size <= 0)
++	continue;
++      client_uuid_var_size += 1;
++      client_uuid_var = grub_malloc(client_uuid_var_size);
++      if (!client_uuid_var)
++	continue;
++      grub_snprintf (client_uuid_var, client_uuid_var_size,
+                      "net_%s_clientuuid", inf->name);
+ 
+       const char *client_uuid;
+       client_uuid = grub_env_get (client_uuid_var);
+ 
++      grub_free(client_uuid_var);
++
+       if (client_uuid)
+         {
+           grub_strcpy (suffix, client_uuid);

0086-don-t-ignore-const.patch

@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 26 Jun 2017 12:43:22 -0400
+Subject: [PATCH] don't ignore const
+
+---
+ grub-core/net/tftp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
+index dcd82494309..f90071353ad 100644
+--- a/grub-core/net/tftp.c
++++ b/grub-core/net/tftp.c
+@@ -307,7 +307,7 @@ static void
+ grub_normalize_filename (char *normalized, const char *filename)
+ {
+   char *dest = normalized;
+-  char *src = filename;
++  const char *src = filename;
+ 
+   while (*src != '\0')
+     {

0087-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 885d7c6420e..2bb8a0e7a38 100644
+index a1af9b46559..2cf6a5ad526 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -177,7 +177,7 @@ grub_reboot (void)
+@@ -166,7 +166,7 @@ grub_reboot (void)
  void
  grub_exit (int retval)
  {

0088-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch

@@ -1,185 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 11 Jul 2019 18:03:25 +0200
-Subject: [PATCH] Attempt to fix up all the places -Wsign-compare=error finds.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/kern/emu/misc.c         |  2 +-
- grub-core/lib/reed_solomon.c      |  4 ++--
- grub-core/osdep/linux/blocklist.c |  2 +-
- grub-core/osdep/linux/getroot.c   |  2 +-
- util/grub-fstest.c                |  2 +-
- util/grub-menulst2cfg.c           |  2 +-
- util/grub-mkfont.c                | 13 +++++++------
- util/grub-probe.c                 |  2 +-
- util/setup.c                      |  2 +-
- 9 files changed, 16 insertions(+), 15 deletions(-)
-
-diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
-index 16c79bc9488..d145e5796b3 100644
---- a/grub-core/kern/emu/misc.c
-+++ b/grub-core/kern/emu/misc.c
-@@ -189,7 +189,7 @@ grub_util_get_image_size (const char *path)
-   sz = ftello (f);
-   if (sz < 0)
-     grub_util_error (_("cannot open `%s': %s"), path, strerror (errno));
--  if (sz != (size_t) sz)
-+  if (sz > (off_t)(GRUB_SIZE_MAX >> 1))
-     grub_util_error (_("file `%s' is too big"), path);
-   ret = (size_t) sz;
- 
-diff --git a/grub-core/lib/reed_solomon.c b/grub-core/lib/reed_solomon.c
-index 562bd2e3e3f..5fee7f2a1a4 100644
---- a/grub-core/lib/reed_solomon.c
-+++ b/grub-core/lib/reed_solomon.c
-@@ -162,7 +162,7 @@ static void
- rs_encode (gf_single_t *data, grub_size_t s, grub_size_t rs)
- {
-   gf_single_t *rs_polynomial;
--  int i, j;
-+  unsigned int i, j;
-   gf_single_t *m;
-   m = xcalloc (s + rs, sizeof (gf_single_t));
-   grub_memcpy (m, data, s * sizeof (gf_single_t));
-@@ -333,7 +333,7 @@ static void
- encode_block (gf_single_t *ptr, grub_size_t s,
- 	      gf_single_t *rptr, grub_size_t rs)
- {
--  int i, j;
-+  unsigned int i, j;
-   for (i = 0; i < SECTOR_SIZE; i++)
-     {
-       grub_size_t ds = (s + SECTOR_SIZE - 1 - i) / SECTOR_SIZE;
-diff --git a/grub-core/osdep/linux/blocklist.c b/grub-core/osdep/linux/blocklist.c
-index 2efee2c2aee..902cfee53ae 100644
---- a/grub-core/osdep/linux/blocklist.c
-+++ b/grub-core/osdep/linux/blocklist.c
-@@ -109,7 +109,7 @@ grub_install_get_blocklist (grub_device_t root_dev,
-   else
-     {
-       struct fiemap *fie2;
--      int i;
-+      unsigned int i;
-       fie2 = xmalloc (sizeof (*fie2)
- 		      + fie1.fm_mapped_extents
- 		      * sizeof (fie1.fm_extents[1]));
-diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 74a48c03026..477fb420992 100644
---- a/grub-core/osdep/linux/getroot.c
-+++ b/grub-core/osdep/linux/getroot.c
-@@ -233,7 +233,7 @@ grub_find_root_devices_from_btrfs (const char *dir)
- {
-   int fd;
-   struct btrfs_ioctl_fs_info_args fsi;
--  int i, j = 0;
-+  unsigned int i, j = 0;
-   char **ret;
- 
-   fd = open (dir, 0);
-diff --git a/util/grub-fstest.c b/util/grub-fstest.c
-index 25ae52ab6f4..982ce9ed7d8 100644
---- a/util/grub-fstest.c
-+++ b/util/grub-fstest.c
-@@ -329,7 +329,7 @@ cmd_cmp (char *src, char *dest)
-   read_file (src, cmp_hook, ff);
- 
-   {
--    grub_uint64_t pre;
-+    long long pre;
-     pre = ftell (ff);
-     fseek (ff, 0, SEEK_END);
-     if (pre != ftell (ff))
-diff --git a/util/grub-menulst2cfg.c b/util/grub-menulst2cfg.c
-index b80e15cc36e..1ea2a86e129 100644
---- a/util/grub-menulst2cfg.c
-+++ b/util/grub-menulst2cfg.c
-@@ -34,7 +34,7 @@ main (int argc, char **argv)
-   char *buf = NULL;
-   size_t bufsize = 0;
-   char *suffix = xstrdup ("");
--  int suffixlen = 0;
-+  size_t suffixlen = 0;
-   const char *out_fname = 0;
- 
-   grub_util_host_init (&argc, &argv);
-diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
-index 7624d7808b7..e8a914021b2 100644
---- a/util/grub-mkfont.c
-+++ b/util/grub-mkfont.c
-@@ -143,7 +143,8 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
-   int width, height;
-   int cuttop, cutbottom, cutleft, cutright;
-   grub_uint8_t *data;
--  int mask, i, j, bitmap_size;
-+  int mask, i, bitmap_size;
-+  unsigned int j;
-   FT_GlyphSlot glyph;
-   int flag = FT_LOAD_RENDER | FT_LOAD_MONOCHROME;
-   FT_Error err;
-@@ -188,7 +189,7 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
-     cuttop = cutbottom = cutleft = cutright = 0;
-   else
-     {
--      for (cuttop = 0; cuttop < glyph->bitmap.rows; cuttop++)
-+      for (cuttop = 0; cuttop < (long)glyph->bitmap.rows; cuttop++)
- 	{
- 	  for (j = 0; j < glyph->bitmap.width; j++)
- 	    if (glyph->bitmap.buffer[j / 8 + cuttop * glyph->bitmap.pitch]
-@@ -208,10 +209,10 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
- 	    break;
- 	}
-       cutbottom = glyph->bitmap.rows - 1 - cutbottom;
--      if (cutbottom + cuttop >= glyph->bitmap.rows)
-+      if (cutbottom + cuttop >= (long)glyph->bitmap.rows)
- 	cutbottom = 0;
- 
--      for (cutleft = 0; cutleft < glyph->bitmap.width; cutleft++)
-+      for (cutleft = 0; cutleft < (long)glyph->bitmap.width; cutleft++)
- 	{
- 	  for (j = 0; j < glyph->bitmap.rows; j++)
- 	    if (glyph->bitmap.buffer[cutleft / 8 + j * glyph->bitmap.pitch]
-@@ -230,7 +231,7 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
- 	    break;
- 	}
-       cutright = glyph->bitmap.width - 1 - cutright;
--      if (cutright + cutleft >= glyph->bitmap.width)
-+      if (cutright + cutleft >= (long)glyph->bitmap.width)
- 	cutright = 0;
-     }
- 
-@@ -267,7 +268,7 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
- 
-   mask = 0;
-   data = &glyph_info->bitmap[0] - 1;
--  for (j = cuttop; j < height + cuttop; j++)
-+  for (j = cuttop; j < (long)height + cuttop; j++)
-     for (i = cutleft; i < width + cutleft; i++)
-       add_pixel (&data, &mask,
- 		 glyph->bitmap.buffer[i / 8 + j * glyph->bitmap.pitch] &
-diff --git a/util/grub-probe.c b/util/grub-probe.c
-index 65c1ca3f8b6..08ae915e8d7 100644
---- a/util/grub-probe.c
-+++ b/util/grub-probe.c
-@@ -799,7 +799,7 @@ argp_parser (int key, char *arg, struct argp_state *state)
- 
-     case 't':
-       {
--	int i;
-+	unsigned int i;
- 
- 	for (i = PRINT_FS; i < ARRAY_SIZE (targets); i++)
- 	  if (strcmp (arg, targets[i]) == 0)
-diff --git a/util/setup.c b/util/setup.c
-index 87a889ff7e3..7aab468b0eb 100644
---- a/util/setup.c
-+++ b/util/setup.c
-@@ -406,7 +406,7 @@ SETUP (const char *dir,
-     int is_ldm;
-     grub_err_t err;
-     grub_disk_addr_t *sectors;
--    int i;
-+    unsigned int i;
-     grub_fs_t fs;
-     unsigned int nsec, maxsec;
- 

0088-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 cd1f46c8bad..f2bf50eb98d 100644
+index f03c03561a1..90dc9bb1017 100644
 --- a/include/grub/dl.h
 +++ b/include/grub/dl.h
 @@ -54,6 +54,7 @@ grub_mod_fini (void)