Exclude /etc/grub.d/01_fallback_counting until we work through some design

questions.
  Resolves: rhbz#1614637

Signed-off-by: Peter Jones <pjones@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-*/
@@ -10,4 +10,3 @@ kojilogs
 tmp/
 .*.sw?
 results_grub2/
-/gnulib-*.tar.?z

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: Tue, 10 Jul 2012 11:58:52 -0400
 Subject: [PATCH] Add support for Linux EFI stub loading.
 
 Also:
@@ -26,25 +26,33 @@ 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(-)
+ include/grub/i386/linux.h         |   1 +
+ 14 files changed, 620 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 9590e87d9c0..0b4b0c2122d 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -1831,12 +1831,6 @@ module = {
+@@ -1626,13 +1626,6 @@ module = {
+   enable = i386_pc;
  };
  
- 
+-
 -module = {
 -  name = linux16;
 -  common = loader/i386/pc/linux.c;
@@ -54,47 +62,37 @@ index a5a3ee31800..3f6e944d6a5 100644
  module = {
    name = ntldr;
    i386_pc = loader/i386/pc/ntldr.c;
-@@ -1892,10 +1886,9 @@ module = {
+@@ -1685,7 +1678,9 @@ module = {
  
  module = {
    name = linux;
 -  x86 = loader/i386/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_efi = loader/i386/efi/linux.c;
+   xen = loader/i386/xen.c;
+   i386_pc = lib/i386/pc/vesa_modes_table.c;
+   mips = loader/mips/linux.c;
+@@ -1696,9 +1691,14 @@ module = {
+   arm_efi = loader/arm64/linux.c;
+   arm_uboot = loader/arm/linux.c;
+   arm64 = loader/arm64/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 e394cd96f8c..04e804d1668 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 +107,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
@@ -128,12 +126,51 @@ index c55f0ecf931..d48d4131ba7 100644
 +
    grub_boot_time ("Loading module %s", filename);
  
-   file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE);
+   file = grub_file_open (filename);
+diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
+index 708581fcbde..c8a9d8307c0 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 42ad7c570a5..5cdf6c943f2 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 +187,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 +197,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 +209,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 1f86229f86b..6c00af98dce 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
- };
+@@ -40,6 +41,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;
+@@ -66,7 +68,8 @@ grub_armxx_efi_linux_check_image (struct linux_armxx_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;
+ 
+@@ -101,79 +104,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_armxx_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_armxx_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_armxx_efi_linux_boot_image((grub_addr_t)kernel_addr,
+-                                          kernel_size, linux_args));
++  return grub_armxx_efi_linux_boot_image((grub_addr_t)kernel_addr, linux_args);
+ }
+ 
+ static grub_err_t
+@@ -287,6 +281,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ {
+   grub_file_t file = 0;
+   struct linux_armxx_kernel_header lh;
++  struct grub_armxx_linux_pe_header *pe;
+ 
+   grub_dl_ref (my_mod);
+ 
+@@ -331,6 +326,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 1003a0b9997..f35b16caa92 100644
+--- a/grub-core/loader/arm64/xen_boot.c
++++ b/grub-core/loader/arm64/xen_boot.c
+@@ -266,7 +266,6 @@ xen_boot (void)
+     return err;
+ 
+   return grub_armxx_efi_linux_boot_image (xen_hypervisor->start,
+-					  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 +446,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 +466,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..3db82e782df
 --- /dev/null
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -0,0 +1,335 @@
@@ -301,7 +538,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 +548,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;
 +}
 +
@@ -352,7 +589,8 @@ index 00000000000..9bfb4ab9e3e
 +
 +  for (i = 0; i < argc; i++)
 +    {
-+      files[i] = grub_file_open (argv[i], GRUB_FILE_TYPE_LINUX_INITRD | GRUB_FILE_TYPE_NO_DECOMPRESS);
++      grub_file_filter_disable_compression ();
++      files[i] = grub_file_open (argv[i]);
 +      if (! files[i])
 +        goto fail;
 +      nfiles++;
@@ -395,17 +633,17 @@ 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;
++  struct linux_kernel_header lh;
 +  grub_ssize_t len, start, filelen;
 +  void *kernel = NULL;
 +
@@ -417,7 +655,7 @@ index 00000000000..9bfb4ab9e3e
 +      goto fail;
 +    }
 +
-+  file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL);
++  file = grub_file_open (argv[0]);
 +  if (! file)
 +    goto fail;
 +
@@ -440,7 +678,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 +720,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 +731,7 @@ 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));
 +
 +  lh.cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
 +
@@ -504,11 +741,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 +778,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 +820,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 b69cb7a3a7f..a3c87cf2fc2 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)),
+@@ -468,14 +468,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
    return grub_errno;
  }
  
@@ -608,7 +845,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)
+@@ -484,5 +490,7 @@ GRUB_MOD_INIT(linux16)
  GRUB_MOD_FINI(linux16)
  {
    grub_unregister_command (cmd_linux);
@@ -616,11 +853,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 712ba17b9ba..5900fc8a40c 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_armxx_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 8655067e039..7b533b57139 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_armxx_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 2c6648d46fc..1061aee9726 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 +928,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_armxx_efi_linux_check_image(struct linux_armxx_kernel_header *lh);
+-grub_err_t grub_armxx_efi_linux_boot_image(grub_addr_t addr, grub_size_t size,
+-                                           char *args);
++grub_err_t grub_armxx_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 +980,18 @@ 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 */
+diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
+index 60c7c3b5e66..bb19dbd5a77 100644
+--- a/include/grub/i386/linux.h
++++ b/include/grub/i386/linux.h
+@@ -142,6 +142,7 @@ struct linux_i386_kernel_header
+   grub_uint64_t setup_data;
+   grub_uint64_t pref_address;
+   grub_uint32_t init_size;
++  grub_uint32_t handover_offset;
+ } GRUB_PACKED;
+ 
+ /* Boot parameters for Linux based on 2.6.12. This is used by the setup

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

@@ -6,17 +6,15 @@ 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 | 37 ++++++++++++++++++++++++-------------
+ 1 file changed, 24 insertions(+), 13 deletions(-)
 
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 977757f2cc9..10f967f2563 100644
+index 9b53d3168f9..f7186be4002 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)),
+@@ -685,13 +685,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)),
+@@ -705,7 +707,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)),
+@@ -713,6 +723,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -60,25 +58,33 @@ 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)),
-   /* We've already read lh so there is no need to read it second time. */
-   len -= sizeof(lh);
+@@ -804,6 +817,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ 		      preferred_address))
+     goto fail;
  
--  if ((len > 0) &&
--      (grub_file_read (file, (char *) &linux_params + sizeof (lh), len) != len))
-+  linux_params_ptr = (void *)&linux_params;
-+  if (len > 0)
-     {
++
+   grub_memset (&linux_params, 0, sizeof (linux_params));
+   grub_memcpy (&linux_params.setup_sects, &lh.setup_sects, sizeof (lh) - 0x1F1);
+ 
+@@ -812,13 +826,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+   linux_params.ps_mouse = linux_params.padding10 =  0;
+ 
+   len = sizeof (linux_params) - sizeof (lh);
+-  if (grub_file_read (file, (char *) &linux_params + sizeof (lh), len) != len)
+-    {
 -      if (!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;
+ 
+@@ -877,7 +888,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
    /* The other parameters are filled when booting.  */
  
@@ -87,8 +93,8 @@ 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)),
-   }
+@@ -1025,9 +1036,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ 			      - (sizeof (LINUX_IMAGE) - 1));
  
    len = prot_file_size;
 -  if (grub_file_read (file, prot_mode_mem, len) != len && !grub_errno)
@@ -98,7 +104,7 @@ index 977757f2cc9..10f967f2563 100644
  
    if (grub_errno == GRUB_ERR_NONE)
      {
-@@ -1032,6 +1041,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -1038,6 +1047,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

@@ -6,17 +6,15 @@ 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(-)
+ grub-core/loader/i386/pc/linux.c | 34 +++++++++++++++++++++-------------
+ 1 file changed, 21 insertions(+), 13 deletions(-)
 
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 4adeee9ae00..600530a742b 100644
+index a3c87cf2fc2..caa76bee8af 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,11 +74,12 @@ 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)),
+@@ -355,10 +363,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    }
  
    len = grub_linux16_prot_size;
--  if (grub_file_read (file, grub_linux_prot_chunk, len) != len && !grub_errno)
+-  if (grub_file_read (file, grub_linux_prot_chunk, grub_linux16_prot_size)
+-      != (grub_ssize_t) grub_linux16_prot_size && !grub_errno)
 -    grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
 -		argv[0]);
 +  grub_memcpy (grub_linux_prot_chunk, kernel + kernel_offset, len);
@@ -88,7 +87,7 @@ index 4adeee9ae00..600530a742b 100644
  
    if (grub_errno == GRUB_ERR_NONE)
      {
-@@ -376,6 +383,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -368,6 +374,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: Fri, 10 Apr 2015 01:45:02 -0400
 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 c8a9d8307c0..91129e33566 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 6c00af98dce..a1ac7a38867 100644
+--- a/grub-core/loader/arm64/linux.c
++++ b/grub-core/loader/arm64/linux.c
+@@ -282,6 +282,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+   grub_file_t file = 0;
+   struct linux_armxx_kernel_header lh;
+   struct grub_armxx_linux_pe_header *pe;
++  int rc;
+ 
+   grub_dl_ref (my_mod);
+ 
+@@ -326,7 +327,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 adc85636633..af2189619a3 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;
+@@ -173,7 +181,6 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
+   /* Fill the file path for the directory.  */
+   d = (grub_efi_device_path_t *) ((char *) file_path
+ 				  + ((char *) d - (char *) dp));
+-  grub_efi_print_device_path (d);
+   copy_file_path ((grub_efi_file_path_device_path_t *) d,
+ 		  dir_start, dir_end - dir_start);
  
-+  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)
+@@ -191,20 +198,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)),
+@@ -216,15 +893,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;
  
@@ -990,8 +997,7 @@ index 2036924504b..e4ac39c87b4 100644
 +      *(--p16) = 0;
 +    }
 +
-+
-   file = grub_file_open (filename, GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE);
+   file = grub_file_open (filename);
    if (! file)
      goto fail;
  
@@ -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;
  
+@@ -261,17 +968,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)),
+@@ -285,7 +989,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)),
+@@ -295,7 +999,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)),
+@@ -304,6 +1008,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)),
+@@ -318,79 +1030,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)),
+ 
+@@ -402,6 +1074,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,21 +1208,20 @@ 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 3db82e782df..8db228c5bf5 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)),
+@@ -118,6 +118,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -1231,21 +1230,21 @@ index 9bfb4ab9e3e..b59d125286d 100644
    params->ramdisk_size = size;
    params->ramdisk_image = (grub_uint32_t)(grub_addr_t) initrd_mem;
  
-@@ -159,6 +161,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-   struct linux_i386_kernel_header lh;
+@@ -160,6 +162,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+   struct linux_kernel_header lh;
    grub_ssize_t len, start, filelen;
    void *kernel = NULL;
 +  int rc;
  
    grub_dl_ref (my_mod);
  
-@@ -184,11 +187,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -185,11 +188,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
    if (grub_file_read (file, kernel, filelen) != filelen)
      {
 -      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,8 +1253,8 @@ index 9bfb4ab9e3e..b59d125286d 100644
 +  if (rc < 0)
      {
        grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"),
-                   argv[0]);
-@@ -203,6 +208,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ 		  argv[0]);
+@@ -204,6 +209,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -1264,12 +1263,12 @@ index 9bfb4ab9e3e..b59d125286d 100644
    grub_memset (params, 0, 16384);
  
    grub_memcpy (&lh, kernel, sizeof (lh));
-@@ -241,6 +248,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -242,6 +249,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
 +  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 7d44732d2c3..c03cc599f63 100644
 --- a/include/grub/efi/pe32.h
 +++ b/include/grub/efi/pe32.h
-@@ -238,7 +238,11 @@ struct grub_pe64_optional_header
+@@ -214,7 +214,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
+@@ -225,12 +229,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
+@@ -239,10 +249,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
+@@ -265,6 +293,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 0b4b0c2122d..e92a7ef322f 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -195,6 +195,7 @@ kernel = {
+   i386_multiboot = kern/i386/pc/acpi.c;
+   i386_coreboot = kern/acpi.c;
+   i386_multiboot = kern/acpi.c;
++  common = kern/efi/sb.c;
+ 
+   x86 = kern/i386/tsc.c;
+   x86 = kern/i386/tsc_pit.c;
+diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
+index 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 04e804d1668..621070918d4 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 91129e33566..708581fcbde 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 af2189619a3..5cd9b6e08a8 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 7f96515da65..87709aa23e8 100644
+--- a/grub-core/loader/i386/bsd.c
++++ b/grub-core/loader/i386/bsd.c
+@@ -38,6 +38,7 @@
+ #ifdef GRUB_MACHINE_PCBIOS
+ #include <grub/machine/int.h>
+ #endif
++#include <grub/efi/sb.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -2124,6 +2125,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");
+ 
+@@ -2163,6 +2167,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 f7186be4002..c84747ea857 100644
+--- a/grub-core/loader/i386/linux.c
++++ b/grub-core/loader/i386/linux.c
+@@ -35,6 +35,7 @@
+ #include <grub/i18n.h>
+ #include <grub/lib/cmdline.h>
+ #include <grub/linux.h>
++#include <grub/efi/sb.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -1156,6 +1157,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,
+@@ -1165,6 +1169,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 caa76bee8af..783a3cd93bc 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+");
+ 
+@@ -480,6 +481,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."));
+@@ -497,6 +501,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 40c67e82489..26df46a4161 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+");
+ 
+@@ -446,6 +447,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,
+@@ -466,6 +470,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 c9885b1bcd7..df8dfdb4ba0 100644
+--- a/grub-core/loader/xnu.c
++++ b/grub-core/loader/xnu.c
+@@ -33,6 +33,7 @@
+ #include <grub/extcmd.h>
+ #include <grub/env.h>
+ #include <grub/i18n.h>
++#include <grub/efi/sb.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -1469,6 +1470,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,
+@@ -1509,6 +1513,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 1061aee9726..39480b38674 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 f4ff62b769a..9c69aa88626 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

@@ -1,46 +1,46 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
-Date: Mon, 8 Jul 2019 12:32:37 +0200
+Date: Tue, 14 Feb 2017 16:18:54 -0500
 Subject: [PATCH] Handle multi-arch (64-on-32) boot in linuxefi loader.
 
 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 8db228c5bf5..800c3e54022 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,28 +52,26 @@ 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)),
+@@ -154,14 +150,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
    return grub_errno;
  }
  
 +#define MIN(a, b) \
-+  ({ typeof (a) _a = (a);  \
++  ({ typeof (a) _a = (a); \
 +     typeof (b) _b = (b); \
 +     _a < _b ? _a : _b; })
 +
  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;
+-  struct linux_kernel_header lh;
 -  grub_ssize_t len, start, filelen;
 +  struct linux_i386_kernel_header *lh = NULL;
 +  grub_ssize_t start, filelen;
@@ -82,7 +80,7 @@ index b59d125286d..3c2e30f8751 100644
    int rc;
  
    grub_dl_ref (my_mod);
-@@ -200,48 +202,79 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -201,48 +203,79 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -168,20 +166,18 @@ 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)
      {
        grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate cmdline"));
-@@ -254,22 +287,24 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -255,21 +288,23 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    grub_memcpy (linux_cmdline, LINUX_IMAGE, sizeof (LINUX_IMAGE));
    grub_create_loader_cmdline (argc, argv,
                                linux_cmdline + sizeof (LINUX_IMAGE) - 1,
--                              lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1),
--                              GRUB_VERIFY_KERNEL_CMDLINE);
-+			      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));
  
 -  lh.cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
 +  grub_dprintf ("linux", "cmdline:%s\n", linux_cmdline);
@@ -197,13 +193,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 +228,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 +237,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 bb19dbd5a77..8474a857ed2 100644
 --- a/include/grub/i386/linux.h
 +++ b/include/grub/i386/linux.h
-@@ -148,6 +148,11 @@ struct linux_i386_kernel_header
+@@ -133,7 +133,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;

0006-re-write-.gitignore.patch

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

0007-re-write-.gitignore.patch

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

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,10 +25,10 @@ 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 62929d983bf..2d53c0e8608 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)
+@@ -588,3 +588,66 @@ grub_ieee1275_get_boot_dev (void)
  
    return bootpath;
  }
@@ -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 78a70a8bf47..249e19bc788 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,20 +133,20 @@ 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 a8502d90711..ab78ca87f90 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
-@@ -28,6 +28,9 @@
+@@ -27,6 +27,9 @@
+ #include <grub/normal.h>
  #include <grub/extcmd.h>
  #include <grub/i18n.h>
- #include <grub/verify.h>
 +#ifdef GRUB_MACHINE_IEEE1275
 +#include <grub/ieee1275/ieee1275.h>
 +#endif
  
  /* Max digits for a char is 3 (0xFF is 255), similarly for an int it
     is sizeof (int) * 3, and one extra for a possible -ve sign.  */
-@@ -883,6 +886,10 @@ grub_script_execute_sourcecode (const char *source)
+@@ -877,6 +880,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 8868f3a756f..2310f33dbc2 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
+@@ -252,6 +252,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 3e12e6b24e1..3e14f539368 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,13 +48,13 @@ 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 2310f33dbc2..ca08bd96681 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,
+@@ -146,6 +146,8 @@ enum grub_ieee1275_flag
+   GRUB_IEEE1275_FLAG_BROKEN_REPEAT,
  
-   GRUB_IEEE1275_FLAG_POWER_KVM,
+   GRUB_IEEE1275_FLAG_CURSORONOFF_ANSI_BROKEN,
 +
 +  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 33332360eec..bc5a3f17541 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 c7888e40f66..783118ccdcd 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -319,6 +319,14 @@ AC_SUBST(grubdirname)
+@@ -289,6 +289,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"
+@@ -498,6 +506,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 e7a83c2d6e2..d2f64b05e0a 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 2adfa97bee8..2fd32608c01 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 bc5a3f17541..b0a8626dd1c 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,24 +13,24 @@ 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 +-
  grub-core/kern/mips/arc/init.c       |  2 +-
  grub-core/kern/mips/loongson/init.c  |  2 +-
  grub-core/kern/mips/qemu_mips/init.c |  2 +-
- grub-core/kern/misc.c                | 11 ++++++++++-
+ grub-core/kern/misc.c                |  2 +-
  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, 39 insertions(+), 21 deletions(-)
 
 diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
-index fa498931ed2..2bd3ac76f2d 100644
+index a3a11824172..b25ca4b9f17 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)),
+@@ -176,12 +176,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 708581fcbde..e339f264b3a 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 76661337f10..82012a72fcb 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, ...)
+@@ -137,9 +137,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 0d8ebf58b95..f5423ce27d9 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)
+@@ -68,7 +68,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..952411d5dc6 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
-@@ -1311,9 +1311,18 @@ grub_abort (void)
+@@ -1095,7 +1095,7 @@ grub_abort (void)
        grub_getkey ();
      }
  
@@ -215,18 +202,7 @@ index 7cee5d75c3c..11037dc0227 100644
 +  grub_exit (1);
  }
  
-+#if defined (__clang__) && !defined (GRUB_UTIL)
-+/* clang emits references to abort().  */
-+void __attribute__ ((noreturn))
-+abort (void)
-+{
-+  grub_abort ();
-+}
-+#endif
-+
  void
- grub_fatal (const char *fmt, ...)
- {
 diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c
 index 3e338645c57..be2a5be1d07 100644
 --- a/grub-core/kern/uboot/init.c
@@ -253,10 +229,10 @@ index 3e338645c57..be2a5be1d07 100644
    else if (ver > API_SIG_VERSION)
      {
 diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c
-index 782ca72952a..708b060f324 100644
+index 0559c033c3d..fce526d417b 100644
 --- a/grub-core/kern/xen/init.c
 +++ b/grub-core/kern/xen/init.c
-@@ -584,7 +584,7 @@ grub_machine_init (void)
+@@ -549,7 +549,7 @@ grub_machine_init (void)
  }
  
  void
@@ -266,15 +242,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 372f009e84f..83fd69f4ada 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 e92a7ef322f..f8065388213 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -219,6 +219,7 @@ kernel = {
+@@ -191,6 +191,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,142 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
+Date: Tue, 27 Nov 2012 17:18:53 -0200
+Subject: [PATCH] DHCP client ID and UUID options added.
+
+---
+ grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----
+ include/grub/net.h    |  2 ++
+ 2 files changed, 81 insertions(+), 8 deletions(-)
+
+diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
+index 9e2fdb795f5..f03eeab2fb4 100644
+--- a/grub-core/net/bootp.c
++++ b/grub-core/net/bootp.c
+@@ -25,6 +25,49 @@
+ #include <grub/net/udp.h>
+ #include <grub/datetime.h>
+ 
++static char *
++grub_env_write_readonly (struct grub_env_var *var __attribute__ ((unused)),
++			 const char *val __attribute__ ((unused)))
++{
++  return NULL;
++}
++
++static void
++set_env_limn_ro (const char *intername, const char *suffix,
++		 const char *value, grub_size_t len)
++{
++  char *varname, *varvalue;
++  char *ptr;
++  varname = grub_xasprintf ("net_%s_%s", intername, suffix);
++  if (!varname)
++    return;
++  for (ptr = varname; *ptr; ptr++)
++    if (*ptr == ':')
++      *ptr = '_';
++  varvalue = grub_malloc (len + 1);
++  if (!varvalue)
++    {
++      grub_free (varname);
++      return;
++    }
++
++  grub_memcpy (varvalue, value, len);
++  varvalue[len] = 0;
++  grub_env_set (varname, varvalue);
++  grub_register_variable_hook (varname, 0, grub_env_write_readonly);
++  grub_env_export (varname);
++  grub_free (varname);
++  grub_free (varvalue);
++}
++
++static char
++hexdigit (grub_uint8_t val)
++{
++  if (val < 10)
++    return val + '0';
++  return val + 'a' - 10;
++}
++
+ static void
+ parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask)
+ {
+@@ -55,6 +98,9 @@ parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask)
+ 
+       taglength = *ptr++;
+ 
++      grub_dprintf("net", "DHCP option %u (0x%02x) found with length %u.\n",
++                   tagtype, tagtype, taglength);
++
+       switch (tagtype)
+ 	{
+ 	case GRUB_NET_BOOTP_NETMASK:
+@@ -120,6 +166,39 @@ parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask)
+                                      taglength);
+           break;
+ 
++        case GRUB_NET_BOOTP_CLIENT_ID:
++	  set_env_limn_ro (name, "clientid", (char *) ptr, taglength);
++          break;
++
++        case GRUB_NET_BOOTP_CLIENT_UUID:
++            {
++              if (taglength != 17)
++                break;
++
++              /* The format is 9cfe245e-d0c8-bd45-a79f-54ea5fbd3d97 */
++
++              ptr += 1;
++              taglength -= 1;
++
++              char *val = grub_malloc (2 * taglength + 4 + 1);
++              int i = 0;
++              int j = 0;
++              for (i = 0; i < taglength; i++)
++                {
++                  val[2 * i + j] = hexdigit (ptr[i] >> 4);
++                  val[2 * i + 1 + j] = hexdigit (ptr[i] & 0xf);
++
++                  if ((i == 3) || (i == 5) || (i == 7) || (i == 9))
++                    {
++                      j++;
++                      val[2 * i + 1+ j] = '-';
++                    }
++                }
++
++              set_env_limn_ro (name, "clientuuid", (char *) val, 2 * taglength + 4);
++            }
++          break;
++
+ 	  /* If you need any other options please contact GRUB
+ 	     development team.  */
+ 	}
+@@ -302,14 +381,6 @@ grub_net_process_dhcp (struct grub_net_buff *nb,
+     }
+ }
+ 
+-static char
+-hexdigit (grub_uint8_t val)
+-{
+-  if (val < 10)
+-    return val + '0';
+-  return val + 'a' - 10;
+-}
+-
+ static grub_err_t
+ grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)),
+ 		  int argc, char **args)
+diff --git a/include/grub/net.h b/include/grub/net.h
+index 1096b24322e..e266bae23f4 100644
+--- a/include/grub/net.h
++++ b/include/grub/net.h
+@@ -457,6 +457,8 @@ enum
+     GRUB_NET_BOOTP_DOMAIN = 0x0f,
+     GRUB_NET_BOOTP_ROOT_PATH = 0x11,
+     GRUB_NET_BOOTP_EXTENSIONS_PATH = 0x12,
++    GRUB_NET_BOOTP_CLIENT_ID = 0x3d,
++    GRUB_NET_BOOTP_CLIENT_UUID = 0x61,
+     GRUB_NET_BOOTP_END = 0xff
+   };
+ 

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-trim-arp-packets-with-abnormal-size.patch

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

0021-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 61ebd7dc714..87a7da34982 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}"
+ 

0022-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

0023-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 3180ac880a9..c7b775bce73 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -517,6 +517,13 @@ script = {
-   installdir = grubconf;
+@@ -487,6 +487,13 @@ script = {
+   condition = COND_HOST_LINUX;
  };
  
 +script = {

0024-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 249e19bc788..759c475c4d9 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;
@@ -62,7 +59,7 @@ index d3f53d93d87..08f48c71df1 100644
 +	    {
 +	      grub_file_t file;
 +
-+	      file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
++	      file = grub_file_open (config);
 +	      if (file)
 +		{
 +		  grub_file_close (file);

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

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

0025-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 9b4e72766ff..02c46f9fdfa 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 d5e10ee8798..0a5b2afb94b 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,
+@@ -85,7 +97,25 @@ int 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,10 +103,10 @@ 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 ab78ca87f90..cf6cd6601d6 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
-@@ -56,6 +56,12 @@ static struct grub_script_scope *scope = 0;
+@@ -55,6 +55,12 @@ static struct grub_script_scope *scope = 0;
  /* Wildcard translator for GRUB script.  */
  struct grub_script_wildcard_translator *grub_wildcard_translator;
  
@@ -113,7 +119,7 @@ index dab8fd2aeb0..c19b4bf700e 100644
  static char*
  wildcard_escape (const char *s)
  {
-@@ -72,7 +78,15 @@ wildcard_escape (const char *s)
+@@ -71,7 +77,15 @@ wildcard_escape (const char *s)
    i = 0;
    while ((ch = *s++))
      {
@@ -130,7 +136,7 @@ index dab8fd2aeb0..c19b4bf700e 100644
  	p[i++] = '\\';
        p[i++] = ch;
      }
-@@ -96,7 +110,14 @@ wildcard_unescape (const char *s)
+@@ -95,7 +109,14 @@ wildcard_unescape (const char *s)
    i = 0;
    while ((ch = *s++))
      {
@@ -146,7 +152,7 @@ index dab8fd2aeb0..c19b4bf700e 100644
  	p[i++] = *s++;
        else
  	p[i++] = ch;
-@@ -398,10 +419,20 @@ parse_string (const char *str,
+@@ -397,10 +418,20 @@ parse_string (const char *str,
      switch (*ptr)
        {
        case '\\':

0026-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 952411d5dc6..8344526be7f 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':
+ 	  {

0027-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 10773fc3435..0769bf850d3 100644
+--- a/grub-core/net/net.c
++++ b/grub-core/net/net.c
+@@ -1735,6 +1735,124 @@ grub_net_restore_hw (void)
+   return GRUB_ERR_NONE;
+ }
+ 
++grub_err_t
++grub_net_search_configfile (char *config)
++{
++  grub_size_t config_len;
++  char *suffix;
++
++  auto int search_through (grub_size_t num_tries, grub_size_t slice_size);
++  int search_through (grub_size_t num_tries, grub_size_t slice_size)
++    {
++      while (num_tries-- > 0)
++        {
++	  grub_dprintf ("net", "probe %s\n", config);
++
++          grub_file_t file;
++          file = grub_file_open (config);
++
++          if (file)
++            {
++              grub_file_close (file);
++              grub_dprintf ("net", "found!\n");
++              return 0;
++            }
++          else
++            {
++              if (grub_errno == GRUB_ERR_IO)
++                grub_errno = GRUB_ERR_NONE;
++            }
++
++          if (grub_strlen (suffix) < slice_size)
++            break;
++
++          config[grub_strlen (config) - slice_size] = '\0';
++        }
++
++      return 1;
++    }
++
++  config_len = grub_strlen (config);
++  config[config_len] = '-';
++  suffix = config + config_len + 1;
++
++  struct grub_net_network_level_interface *inf;
++  FOR_NET_NETWORK_LEVEL_INTERFACES (inf)
++    {
++      /* By the Client UUID. */
++
++      char client_uuid_var[sizeof ("net_") + grub_strlen (inf->name) +
++                           sizeof ("_clientuuid") + 1];
++      grub_snprintf (client_uuid_var, sizeof (client_uuid_var),
++                     "net_%s_clientuuid", inf->name);
++
++      const char *client_uuid;
++      client_uuid = grub_env_get (client_uuid_var);
++
++      if (client_uuid)
++        {
++          grub_strcpy (suffix, client_uuid);
++          if (search_through (1, 0) == 0) return GRUB_ERR_NONE;
++        }
++
++      /* By the MAC address. */
++
++      /* Add ethernet type */
++      grub_strcpy (suffix, "01-");
++
++      grub_net_hwaddr_to_str (&inf->hwaddress, suffix + 3);
++
++      char *ptr;
++      for (ptr = suffix; *ptr; ptr++)
++        if (*ptr == ':')
++          *ptr = '-';
++
++      if (search_through (1, 0) == 0) return GRUB_ERR_NONE;
++
++      /* By IP address */
++
++      switch ((&inf->address)->type)
++        {
++        case GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4:
++            {
++              grub_uint32_t n = grub_be_to_cpu32 ((&inf->address)->ipv4);
++              grub_snprintf (suffix, GRUB_NET_MAX_STR_ADDR_LEN, "%02X%02X%02X%02X", \
++                             ((n >> 24) & 0xff), ((n >> 16) & 0xff), \
++                             ((n >> 8) & 0xff), ((n >> 0) & 0xff));
++
++              if (search_through (8, 1) == 0) return GRUB_ERR_NONE;
++              break;
++            }
++        case GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV6:
++            {
++              char buf[GRUB_NET_MAX_STR_ADDR_LEN];
++              struct grub_net_network_level_address base;
++              base.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV6;
++              grub_memcpy (&base.ipv6, ((&inf->address)->ipv6), 16);
++              grub_net_addr_to_str (&base, buf);
++
++              for (ptr = buf; *ptr; ptr++)
++                if (*ptr == ':')
++                  *ptr = '-';
++
++              grub_snprintf (suffix, GRUB_NET_MAX_STR_ADDR_LEN, "%s", buf);
++              if (search_through (1, 0) == 0) return GRUB_ERR_NONE;
++              break;
++            }
++        case GRUB_NET_NETWORK_LEVEL_PROTOCOL_DHCP_RECV:
++          return grub_error (GRUB_ERR_BUG, "shouldn't reach here");
++        default:
++          return grub_error (GRUB_ERR_BUG,
++                             "unsupported address type %d", (&inf->address)->type);
++        }
++    }
++
++  /* Remove the remaining minus sign at the end. */
++  config[config_len] = '\0';
++
++  return GRUB_ERR_NONE;
++}
++
+ static struct grub_preboot *fini_hnd;
+ 
+ static grub_command_t cmd_addaddr, cmd_deladdr, cmd_addroute, cmd_delroute;
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index 759c475c4d9..b2654ef62e8 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 e266bae23f4..50d62ab0c8c 100644
+--- a/include/grub/net.h
++++ b/include/grub/net.h
+@@ -566,4 +566,7 @@ extern char *grub_net_default_server;
+ 
+ #define VLANTAG_IDENTIFIER 0x8100
+ 
++grub_err_t
++grub_net_search_configfile (char *config);
++
+ #endif /* ! GRUB_NET_HEADER */

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

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

0029-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 b0a8626dd1c..f68d4925ee6 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 87a7da34982..233754ff296 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
  

0030-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 4880cefe3f8..b22e1bcc94b 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 233754ff296..3a5aa0f8dc9 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

0031-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 b2654ef62e8..f57b7508a76 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -202,15 +202,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)
+@@ -235,6 +236,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

0032-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,

0033-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 ();

0034-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;
+ 

0035-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 f57b7508a76..0ce59fdc3f0 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -426,8 +426,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);

0036-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,

0037-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-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-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*/
+ 

0039-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_

0040-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);

0041-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 3a5aa0f8dc9..6299836b5cd 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 e8143b079dc..972a4b5a03d 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
+ 

0042-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

0043-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;
+ 	}
+     }
+ 

0044-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 311da61c6c5..044ab3abe88 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

0045-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 0a5b2afb94b..970ea868c14 100644
+--- a/grub-core/lib/cmdline.c
++++ b/grub-core/lib/cmdline.c
+@@ -97,16 +97,7 @@ int grub_create_loader_cmdline (int argc, char *argv[], char *buf,
+ 
+       while (*c)
+ 	{
+-	  if (*c == ' ')
+-	    {
+-	      *buf++ = '\\';
+-	      *buf++ = 'x';
+-	      *buf++ = '2';
+-	      *buf++ = '0';
+-	      c++;
+-	      continue;
+-	    }
+-	  else if (*c == '\\' && *(c+1) == 'x' &&
++	  if (*c == '\\' && *(c+1) == 'x' &&
+ 		   is_hex(*(c+2)) && is_hex(*(c+3)))
+ 	    {
+ 	      *buf++ = *c++;

0046-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 6299836b5cd..b744438e04a 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -26,7 +26,7 @@ datarootdir="@datarootdir@"

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

0047-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 d2f64b05e0a..5e2f5283d3d 100644
+--- a/grub-core/normal/menu.c
++++ b/grub-core/normal/menu.c
+@@ -838,12 +838,14 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
+ 
+ /* 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;
+ 

0049-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 0ce59fdc3f0..a3713efcd90 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)),
+@@ -343,7 +343,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)),
+@@ -366,7 +366,8 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
  	    }
  	}
  

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

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

0051-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch

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

0051-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);
+ 

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

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

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-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch

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

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

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

0056-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 b744438e04a..43d98476b88 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@"

0057-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 ;;

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

@@ -1,32 +1,44 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
-Date: Tue, 9 Jul 2019 10:35:16 +0200
+Date: Fri, 3 Oct 2014 11:08:03 -0400
 Subject: [PATCH] Try $prefix if $fw_path doesn't work.
 
 Related: rhbz#1148652
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- grub-core/kern/ieee1275/init.c |  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 f5423ce27d9..e01bc6eab19 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)
+@@ -124,23 +124,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 0769bf850d3..16d2ce06d5a 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 7d9c4f09b9b..b69f9e738fa 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -335,81 +335,79 @@ grub_enter_normal_mode (const char *config)
+@@ -331,74 +331,72 @@ grub_enter_normal_mode (const char *config)
    grub_boot_time ("Exiting normal mode");
  }
  
@@ -85,45 +82,38 @@ 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) +
-+         sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
-+       config = grub_malloc (config_len);
++	grub_size_t config_len;
++	config_len = grub_strlen (prefix) +
++	  sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
++	config = grub_malloc (config_len);
 +
-+       if (! config)
-+         return GRUB_ERR_FILE_NOT_FOUND;
++	if (! config)
++	  return GRUB_ERR_FILE_NOT_FOUND;
 +
-+       grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
-+       err = grub_net_search_config_file (config);
++	grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
++	err = grub_net_search_configfile (config);
 +      }
 +
 +    if (err != GRUB_ERR_NONE)
 +      {
-+       config = grub_xasprintf ("%s/grub.cfg", prefix);
-+       if (config)
-+         {
-+           grub_file_t file;
-+           file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
-+           if (file)
-+             {
-+               grub_file_close (file);
-+               err = GRUB_ERR_NONE;
-+             }
-+         }
++	config = grub_xasprintf ("%s/grub.cfg", prefix);
++	if (config)
++	  {
++	    grub_file_t file;
++	    file = grub_file_open (config);
++	    if (file)
++	      {
++		grub_file_close (file);
++		err = GRUB_ERR_NONE;
++	      }
++	  }
 +      }
 +
 +    if (err == GRUB_ERR_NONE)
@@ -145,65 +135,58 @@ 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)
--            {
--              grub_size_t config_len;
--              config_len = grub_strlen (prefix) +
--                sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
--              config = grub_malloc (config_len);
+-	{
+-	  if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0)
+-	    {
+-	      grub_size_t config_len;
+-	      config_len = grub_strlen (prefix) +
+-		sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
+-	      config = grub_malloc (config_len);
 -
--              if (! config)
--                goto quit;
+-	      if (! config)
+-		goto quit;
 -
--              grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
+-	      grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
 -
--              grub_net_search_configfile (config);
+-	      grub_net_search_configfile (config);
 -
--              grub_enter_normal_mode (config);
--              grub_free (config);
--              config = NULL;
--            }
+-	      grub_enter_normal_mode (config);
+-	      grub_free (config);
+-	      config = NULL;
+-	    }
 -
--          if (!config)
--            {
--              config = grub_xasprintf ("%s/grub.cfg", prefix);
--              if (config)
--                {
--                  grub_file_t file;
+-	  if (!config)
+-	    {
+-	      config = grub_xasprintf ("%s/grub.cfg", prefix);
+-	      if (config)
+-		{
+-		  grub_file_t file;
 -
--                  file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
--                  if (file)
--                    {
--                      grub_file_close (file);
--                      grub_enter_normal_mode (config);
--                    }
--                  else
--                    {
--                      /*  Ignore all errors.  */
--                      grub_errno = 0;
--                    }
--                  grub_free (config);
--                }
--            }
--        }
+-		  file = grub_file_open (config);
+-		  if (file)
+-		    {
+-		      grub_file_close (file);
+-		      grub_enter_normal_mode (config);
+-		    }
+-		  else
+-		    {
+-		      /*  Ignore all errors.  */
+-		      grub_errno = 0;
+-		    }
+-		  grub_free (config);
+-		}
+-	    }
+-	}
 -      else
--        {
--          grub_enter_normal_mode (0);
--        }
+-	{
+-	  grub_enter_normal_mode (0);
+-	}
 -    }
 -  else
 +  if (argc)

0059-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 2fd32608c01..a7155c22ffe 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.
+ 

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
- {

0060-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
+---
+ configure.ac              |  29 +++++
+ Makefile.util.def         |  16 +++
+ util/grub-rpm-sort.c      | 281 ++++++++++++++++++++++++++++++++++++++++++++++
+ .gitignore                |   2 +
+ util/grub-mkconfig_lib.in |   8 +-
+ util/grub-rpm-sort.8      |  12 ++
+ 6 files changed, 347 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 d5db2803ec4..056df1cbaf9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,6 +65,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])
+@@ -88,6 +89,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])
+@@ -1790,6 +1792,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 d08713b5500..406d96861b6 100644
+--- a/Makefile.util.def
++++ b/Makefile.util.def
+@@ -685,6 +685,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 = grub-core/gnulib/libgnu.a;
++  ldadd = libgrubkern.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/.gitignore b/.gitignore
+index 43f04d47277..fa2e5b609b1 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -105,6 +105,8 @@ grub-*.tar.*
+ /grub*-reboot.8
+ /grub*-render-label
+ /grub*-render-label.1
++/grub*-rpm-sort
++/grub*-rpm-sort.8
+ /grub*-script-check
+ /grub*-script-check.1
+ /grub*-set-default
+diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
+index 1a4a57898f9..7fe3598435c 100644
+--- a/util/grub-mkconfig_lib.in
++++ b/util/grub-mkconfig_lib.in
+@@ -214,6 +214,12 @@ version_sort ()
+    esac
+ }
+ 
++if [ "x$RPMLIB" = x ]; then
++  kernel_sort=version_sort
++else
++  kernel_sort="${sbindir}/grub-rpm-sort"
++fi
++
+ version_test_numeric ()
+ {
+   version_test_numeric_a="$1"
+@@ -230,7 +236,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"

0061-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')
+ 	{

0062-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 43d98476b88..a8a8e2cf325 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

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

@@ -8,43 +8,36 @@ without having to alter the grub.cfg. The hashed password now
 lives in a root-only-readable configuration file.
 
 Resolves: rhbz#985962
-
-Signed-off-by: Robert Marshall <rmarshall@redhat.com>
-[pjones: fix the efidir in grub-setpassword and rename tool]
-Signed-off-by: Peter Jones <pjones@redhat.com>
-[luto: fix grub-setpassword -o's output path]
-Signed-off-by: Andy Lutomirski <luto@kernel.org>
-[rharwood: migrate man page to h2m, context]
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- 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
- create mode 100644 util/grub-set-password.in
+ configure.ac             |   1 +
+ Makefile.util.def        |  13 +++++
+ .gitignore               |   2 +
+ util/grub-mkconfig.in    |   2 +
+ util/grub-setpassword.8  |  28 +++++++++++
+ util/grub-setpassword.in | 123 +++++++++++++++++++++++++++++++++++++++++++++++
+ util/grub.d/01_users.in  |  11 +++++
+ 7 files changed, 180 insertions(+)
+ create mode 100644 util/grub-setpassword.8
+ create mode 100644 util/grub-setpassword.in
  create mode 100644 util/grub.d/01_users.in
 
 diff --git a/configure.ac b/configure.ac
-index ae3a49321ad..493e336ec6c 100644
+index 056df1cbaf9..679f634ce4c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -77,6 +77,7 @@ grub_TRANSFORM([grub-mkrelpath])
+@@ -65,6 +65,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-setpassword])
+ 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 406d96861b6..fd91045bd6d 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -455,6 +455,12 @@ script = {
+@@ -440,6 +440,12 @@ script = {
    installdir = grubconf;
  };
  
@@ -57,13 +50,13 @@ index 09bfcadd976..95884956a68 100644
  script = {
    name = '10_windows';
    common = util/grub.d/10_windows.in;
-@@ -733,6 +739,13 @@ script = {
+@@ -722,6 +728,13 @@ script = {
    installdir = sbin;
  };
  
 +script = {
-+  name = grub-set-password;
-+  common = util/grub-set-password.in;
++  name = grub-setpassword;
++  common = util/grub-setpassword.in;
 +  mansection = 8;
 +  installdir = sbin;
 +};
@@ -71,19 +64,24 @@ 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/.gitignore b/.gitignore
+index fa2e5b609b1..5066689bc0a 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -111,6 +111,8 @@ grub-*.tar.*
+ /grub*-script-check.1
+ /grub*-set-default
+ /grub*-set-default.8
++/grub*-setsetpassword
++/grub*-setsetpassword.8
+ /grub*-shell
+ /grub*-shell-tester
+ /grub*-sparc64-setup
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 7b355115dd4..5f2824d4f58 100644
+index f68d4925ee6..bdb9982aefb 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,17 +90,50 @@ index 7b355115dd4..5f2824d4f58 100644
      *)
        if grub_file_is_not_garbage "$i" && test -x "$i" ; then
          echo
-diff --git a/util/grub-set-password.in b/util/grub-set-password.in
+diff --git a/util/grub-setpassword.8 b/util/grub-setpassword.8
 new file mode 100644
-index 00000000000..5ebf50576d6
+index 00000000000..49200a848b7
 --- /dev/null
-+++ b/util/grub-set-password.in
-@@ -0,0 +1,128 @@
++++ b/util/grub-setpassword.8
+@@ -0,0 +1,28 @@
++.TH GRUB-SETPASSWORD 3 "Thu Jun 25 2015"
++.SH NAME
++\fBgrub-setpassword\fR \(em Generate the user.cfg file containing the hashed grub bootloader password.
++
++.SH SYNOPSIS
++\fBgrub-setpassword\fR [OPTION]
++
++.SH DESCRIPTION
++\fBgrub-setpassword\fR outputs the user.cfg file which contains the hashed GRUB bootloader password. This utility only supports configurations where there is a single root user.
++
++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 PATH\fR]
++Choose the file path to which user.cfg will be written.
++
++.SH SEE ALSO
++.BR "info grub"
++
++.BR "info grub2-mkpasswd-pbkdf2"
+diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
+new file mode 100644
+index 00000000000..dd76f00fc0e
+--- /dev/null
++++ b/util/grub-setpassword.in
+@@ -0,0 +1,123 @@
 +#!/bin/sh -e
 +
-+EFIDIR=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')
 +if [ -d /sys/firmware/efi/efivars/ ]; then
-+    grubdir=`echo "/@bootdirname@/efi/EFI/${EFIDIR}/" | sed 's,//*,/,g'`
++    grubdir=`echo "/@bootdirname@/efi/EFI/redhat/" | sed 's,//*,/,g'`
 +else
 +    grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`
 +fi
@@ -117,14 +148,15 @@ index 00000000000..5ebf50576d6
 +# Print the usage.
 +usage () {
 +    cat <<EOF
-+Usage: $0 [OPTION]
-+$0 prompts the user to set a password on the grub bootloader. The password
-+is written to a file named user.cfg which lives in the GRUB directory
-+located by default at ${grubdir}.
++Usage: $0 [OPTION] [SOURCE]
++Run GRUB script in a Qemu instance.
 +
-+  -h, --help                     print this message and exit
-+  -v, --version                  print the version information and exit
-+  -o, --output_path <DIRECTORY>  put user.cfg in a user-selected directory
++  -h, --help              print this message and exit
++  -v, --version           print the version information and exit
++  -o, --output_path       choose a custom output path for user.cfg
++
++$0 prompts the user to set a password on the grub bootloader. The password
++is written to a file named user.cfg.
 +
 +Report bugs at https://bugzilla.redhat.com.
 +EOF
@@ -205,7 +237,7 @@ index 00000000000..5ebf50576d6
 +    P1="$1" && shift
 +
 +    ( echo ${P0} ; echo ${P1} ) | \
-+        LC_ALL=C ${grub_mkpasswd} | \
++        ${grub_mkpasswd} | \
 +        grep -v '[eE]nter password:' | \
 +        sed -e "s/PBKDF2 hash of your password is //"
 +}
@@ -218,14 +250,9 @@ index 00000000000..5ebf50576d6
 +
 +# on the ESP, these will fail to set the permissions, but it's okay because
 +# the directory is protected.
-+install -m 0600 /dev/null "${OUTPUT_PATH}/user.cfg" 2>/dev/null || :
-+chmod 0600 "${OUTPUT_PATH}/user.cfg" 2>/dev/null || :
-+echo "GRUB2_PASSWORD=${MYPASS}" > "${OUTPUT_PATH}/user.cfg"
-+
-+if ! grep -q "^### BEGIN /etc/grub.d/01_users ###$" "${OUTPUT_PATH}/grub.cfg"; then
-+    echo "WARNING: The current configuration lacks password support!"
-+    echo "Update your configuration with @grub_mkconfig@ to support this feature."
-+fi
++install -m 0600 /dev/null "${grubdir}/user.cfg" 2>/dev/null || :
++chmod 0600 "${grubdir}/user.cfg" 2>/dev/null || :
++echo "GRUB2_PASSWORD=${MYPASS}" > "${grubdir}/user.cfg"
 diff --git a/util/grub.d/01_users.in b/util/grub.d/01_users.in
 new file mode 100644
 index 00000000000..db2f44bfb78

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

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

0065-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;

0066-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch

@@ -1,108 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Michael Chang <mchang@suse.com>
-Date: Wed, 10 Jul 2019 23:58:28 +0200
-Subject: [PATCH] bootp: Add processing DHCPACK packet from HTTP Boot
-
-The vendor class identifier with the string "HTTPClient" is used to denote the
-packet as responding to HTTP boot request. In DHCP4 config, the filename for
-HTTP boot is the URL of the boot file while for PXE boot it is the path to the
-boot file. As a consequence, the next-server becomes obseleted because the HTTP
-URL already contains the server address for the boot file. For DHCP6 config,
-there's no difference definition in existing config as dhcp6.bootfile-url can
-be used to specify URL for both HTTP and PXE boot file.
-
-This patch adds processing for "HTTPClient" vendor class identifier in DHCPACK
-packet by treating it as HTTP format, not as the PXE format.
-
-Signed-off-by: Michael Chang <mchang@suse.com>
-Signed-off-by: Ken Lin <ken.lin@hpe.com>
----
- grub-core/net/bootp.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++
- include/grub/net.h    |  1 +
- 2 files changed, 56 insertions(+)
-
-diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 76e4c11a46f..f56b293ac72 100644
---- a/grub-core/net/bootp.c
-+++ b/grub-core/net/bootp.c
-@@ -20,6 +20,7 @@
- #include <grub/env.h>
- #include <grub/i18n.h>
- #include <grub/command.h>
-+#include <grub/net.h>
- #include <grub/net/ip.h>
- #include <grub/net/netbuff.h>
- #include <grub/net/udp.h>
-@@ -501,6 +502,60 @@ grub_net_configure_by_dhcp_ack (const char *name,
-   if (opt && opt_len)
-     grub_env_set_net_property (name, "rootpath", (const char *) opt, opt_len);
- 
-+  opt = find_dhcp_option (bp, size, GRUB_NET_BOOTP_VENDOR_CLASS_IDENTIFIER, &opt_len);
-+  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)
-+        {
-+          char *proto, *ip, *pa;
-+
-+          if (!dissect_url (bp->boot_file, &proto, &ip, &pa))
-+            return inter;
-+
-+          grub_env_set_net_property (name, "boot_file", pa, grub_strlen (pa));
-+          if (is_def)
-+            {
-+              grub_net_default_server = grub_strdup (ip);
-+              grub_env_set ("net_default_interface", name);
-+             grub_env_export ("net_default_interface");
-+            }
-+          if (device && !*device)
-+            {
-+              *device = grub_xasprintf ("%s,%s", proto, ip);
-+              grub_print_error ();
-+            }
-+          if (path)
-+            {
-+              *path = grub_strdup (pa);
-+              grub_print_error ();
-+              if (*path)
-+                {
-+                  char *slash;
-+                  slash = grub_strrchr (*path, '/');
-+                  if (slash)
-+                    *slash = 0;
-+                  else
-+                    **path = 0;
-+                }
-+            }
-+          grub_net_add_ipv4_local (inter, mask);
-+          inter->dhcp_ack = grub_malloc (size);
-+          if (inter->dhcp_ack)
-+            {
-+              grub_memcpy (inter->dhcp_ack, bp, size);
-+              inter->dhcp_acklen = size;
-+            }
-+          else
-+            grub_errno = GRUB_ERR_NONE;
-+
-+          grub_free (proto);
-+          grub_free (ip);
-+          grub_free (pa);
-+          return inter;
-+        }
-+    }
-+
-   opt = find_dhcp_option (bp, size, GRUB_NET_BOOTP_EXTENSIONS_PATH, &opt_len);
-   if (opt && opt_len)
-     grub_env_set_net_property (name, "extensionspath", (const char *) opt, opt_len);
-diff --git a/include/grub/net.h b/include/grub/net.h
-index 1d76fd9a1f5..868c9a2ef29 100644
---- a/include/grub/net.h
-+++ b/include/grub/net.h
-@@ -533,6 +533,7 @@ enum
-     GRUB_NET_DHCP_MESSAGE_TYPE = 53,
-     GRUB_NET_DHCP_SERVER_IDENTIFIER = 54,
-     GRUB_NET_DHCP_PARAMETER_REQUEST_LIST = 55,
-+    GRUB_NET_BOOTP_VENDOR_CLASS_IDENTIFIER = 60,
-     GRUB_NET_BOOTP_CLIENT_ID = 61,
-     GRUB_NET_DHCP_TFTP_SERVER_NAME = 66,
-     GRUB_NET_DHCP_BOOTFILE_NAME = 67,

0066-efinet-retransmit-if-our-device-is-busy.patch

@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Josef Bacik <jbacik@fb.com>
+Date: Mon, 31 Aug 2015 13:34:35 -0400
+Subject: [PATCH] efinet: retransmit if our device is busy
+
+When I fixed the txbuf handling I ripped out the retransmission code since it
+was flooding our network when we had the buggy behavior.  Turns out this was too
+heavy handed as we can still have transient tx timeouts.  So instead make sure
+we retry our transmission once per timeout.  This way we can deal with transient
+transmission problems without flooding the box.  This fixes an issue we were
+seeing in production.  Thanks,
+
+Signed-off-by: Josef Bacik <jbacik@fb.com>
+---
+ grub-core/net/drivers/efi/efinet.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
+index 5388f952ba9..3f112438a93 100644
+--- a/grub-core/net/drivers/efi/efinet.c
++++ b/grub-core/net/drivers/efi/efinet.c
+@@ -38,6 +38,7 @@ send_card_buffer (struct grub_net_card *dev,
+   grub_efi_simple_network_t *net = dev->efi_net;
+   grub_uint64_t limit_time = grub_get_time_ms () + 4000;
+   void *txbuf;
++  int retry = 0;
+ 
+   if (dev->txbusy)
+     while (1)
+@@ -60,6 +61,15 @@ send_card_buffer (struct grub_net_card *dev,
+ 	    dev->txbusy = 0;
+ 	    break;
+ 	  }
++	if (!retry)
++	  {
++	    st = efi_call_7 (net->transmit, net, 0, dev->last_pkt_size,
++			     dev->txbuf, NULL, NULL, NULL);
++	    if (st != GRUB_EFI_SUCCESS)
++	      return grub_error (GRUB_ERR_IO,
++				 N_("couldn't send network packet"));
++	    retry = 1;
++	  }
+ 	if (limit_time < grub_get_time_ms ())
+ 	  return grub_error (GRUB_ERR_TIMEOUT,
+ 			     N_("couldn't send network packet"));

0067-Be-more-aggro-about-actually-using-the-configured-ne.patch

@@ -0,0 +1,221 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Fri, 11 Sep 2015 17:30:49 -0400
+Subject: [PATCH] Be more aggro about actually using the *configured* network
+ device.
+
+Right now we use any SNP device with the same mac+IP block, but when
+it's discovered there will be more than one of them.  We need to pick
+the same one we were loaded with, so that  it'll be configured the same
+way as it was before, and won't be re-used by the system firmware later.
+
+Resolves: rhbz#1257475
+
+Signed-off-by: Peter Jones <example@example.com>
+---
+ grub-core/net/drivers/efi/efinet.c | 124 +++++++++++++++++++++++++++++--------
+ include/grub/efi/api.h             |   4 ++
+ 2 files changed, 102 insertions(+), 26 deletions(-)
+
+diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
+index 3f112438a93..a3ce4c67cce 100644
+--- a/grub-core/net/drivers/efi/efinet.c
++++ b/grub-core/net/drivers/efi/efinet.c
+@@ -239,46 +239,85 @@ grub_efinet_get_device_handle (struct grub_net_card *card)
+   return card->efi_handle;
+ }
+ 
+-static void
+-grub_efinet_findcards (void)
++static int
++grub_efinet_find_snp_cards (int preferred_only, grub_efi_handle_t preferred,
++			    int *i)
+ {
+-  grub_efi_uintn_t num_handles;
+-  grub_efi_handle_t *handles;
++  grub_efi_uintn_t num_handles = 0;
++  grub_efi_handle_t *handles = NULL;
+   grub_efi_handle_t *handle;
+-  int i = 0;
++  grub_efi_device_path_t *pdp = NULL, *pp = NULL, *pc = NULL;
++  int ret = 0;
+ 
+-  /* Find handles which support the disk io interface.  */
++  if (preferred)
++    {
++      grub_efi_device_path_t *pdpc;
++      pdpc = pdp = grub_efi_get_device_path (preferred);
++      if (pdp == NULL)
++	{
++	  grub_print_error ();
++	  return -1;
++	}
++
++      for (; ! GRUB_EFI_END_ENTIRE_DEVICE_PATH (pdpc);
++	   pdpc = GRUB_EFI_NEXT_DEVICE_PATH (pdpc))
++	{
++	  pp = pc;
++	  pc = pdpc;
++	}
++    }
++
++  /* Find handles which support the SNP interface.  */
+   handles = grub_efi_locate_handle (GRUB_EFI_BY_PROTOCOL, &net_io_guid,
+ 				    0, &num_handles);
+-  if (! handles)
+-    return;
+-  for (handle = handles; num_handles--; handle++)
++
++  for (handle = handles; handle && num_handles--; handle++)
+     {
+       grub_efi_simple_network_t *net;
+       struct grub_net_card *card;
+       grub_efi_device_path_t *dp, *parent = NULL, *child = NULL;
+ 
+-      /* EDK2 UEFI PXE driver creates IPv4 and IPv6 messaging devices as
+-	 children of main MAC messaging device. We only need one device with
+-	 bound SNP per physical card, otherwise they compete with each other
+-	 when polling for incoming packets.
+-       */
++      /* if we're looking for only the preferred handle, skip anything that
++	 isn't it. */
++      if (preferred_only && preferred != NULL && *handle != preferred)
++	continue;
++
++      /* if we're not looking for the preferred handle, skip it if it's
++	 found. */
++      if (!preferred_only && *handle == preferred)
++	continue;
++
+       dp = grub_efi_get_device_path (*handle);
+       if (!dp)
+ 	continue;
+-      for (; ! GRUB_EFI_END_ENTIRE_DEVICE_PATH (dp); dp = GRUB_EFI_NEXT_DEVICE_PATH (dp))
++
++      for (; ! GRUB_EFI_END_ENTIRE_DEVICE_PATH (dp);
++	   dp = GRUB_EFI_NEXT_DEVICE_PATH (dp))
+ 	{
+ 	  parent = child;
+ 	  child = dp;
+ 	}
+-      if (child
+-	  && GRUB_EFI_DEVICE_PATH_TYPE (child) == GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
+-	  && (GRUB_EFI_DEVICE_PATH_SUBTYPE (child) == GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE
+-	      || GRUB_EFI_DEVICE_PATH_SUBTYPE (child) == GRUB_EFI_IPV6_DEVICE_PATH_SUBTYPE)
+-	  && parent
+-	  && GRUB_EFI_DEVICE_PATH_TYPE (parent) == GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
+-	  && GRUB_EFI_DEVICE_PATH_SUBTYPE (parent) == GRUB_EFI_MAC_ADDRESS_DEVICE_PATH_SUBTYPE)
+-	continue;
++
++      if (!preferred_only)
++	{
++	  if (pp && pc
++	      && grub_efi_compare_device_paths (pp, parent) == 0
++	      && grub_efi_compare_device_paths (pc, child) == 0)
++	    continue;
++
++	  if (child
++	      && (GRUB_EFI_DEVICE_PATH_IS_TYPE(child,
++					  GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE,
++					  GRUB_EFI_IPV6_DEVICE_PATH_SUBTYPE) ||
++		  GRUB_EFI_DEVICE_PATH_IS_TYPE(child,
++					  GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE,
++					  GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE))
++	      && parent
++	      && (GRUB_EFI_DEVICE_PATH_IS_TYPE(parent,
++				    GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE,
++				    GRUB_EFI_MAC_ADDRESS_DEVICE_PATH_SUBTYPE)))
++	    continue;
++	}
+ 
+       net = grub_efi_open_protocol (*handle, &net_io_guid,
+ 				    GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
+@@ -302,7 +341,7 @@ grub_efinet_findcards (void)
+ 	{
+ 	  grub_print_error ();
+ 	  grub_free (handles);
+-	  return;
++	  return -1;
+ 	}
+ 
+       card->mtu = net->mode->max_packet_size;
+@@ -313,13 +352,14 @@ grub_efinet_findcards (void)
+ 	  grub_print_error ();
+ 	  grub_free (handles);
+ 	  grub_free (card);
+-	  return;
++	  return -1;
+ 	}
+       card->txbusy = 0;
+ 
+       card->rcvbufsize = ALIGN_UP (card->mtu, 64) + 256;
+ 
+-      card->name = grub_xasprintf ("efinet%d", i++);
++      card->name = grub_xasprintf ("efinet%d", *i);
++      *i = (*i)+1;
+       card->driver = &efidriver;
+       card->flags = 0;
+       card->default_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
+@@ -330,8 +370,38 @@ grub_efinet_findcards (void)
+       card->efi_handle = *handle;
+ 
+       grub_net_card_register (card);
++      ret++;
+     }
+   grub_free (handles);
++
++  return ret;
++}
++
++static void
++grub_efinet_findcards (void)
++{
++  grub_efi_loaded_image_t *image = NULL;
++  int rc;
++  int efinet_number = 0;
++
++  image = grub_efi_get_loaded_image (grub_efi_image_handle);
++
++  if (image && image->device_handle)
++    {
++      rc = grub_efinet_find_snp_cards (1, image->device_handle, &efinet_number);
++      if (rc < 0)
++	return;
++
++      rc = grub_efinet_find_snp_cards (0, image->device_handle, &efinet_number);
++      if (rc < 0)
++	return;
++    }
++  else
++    {
++      rc = grub_efinet_find_snp_cards (0, NULL, &efinet_number);
++      if (rc < 0)
++	return;
++    }
+ }
+ 
+ static void
+@@ -352,6 +422,8 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+     struct grub_efi_pxe_mode *pxe_mode;
+     if (card->driver != &efidriver)
+       continue;
++    if (hnd != card->efi_handle)
++      continue;
+     cdp = grub_efi_get_device_path (card->efi_handle);
+     if (! cdp)
+       continue;
+diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
+index c7c9f0e1db1..97b9aa7a4d7 100644
+--- a/include/grub/efi/api.h
++++ b/include/grub/efi/api.h
+@@ -622,6 +622,10 @@ typedef struct grub_efi_device_path grub_efi_device_path_t;
+    It seems to be identical to EFI_DEVICE_PATH.  */
+ typedef struct grub_efi_device_path grub_efi_device_path_protocol_t;
+ 
++#define GRUB_EFI_DEVICE_PATH_IS_TYPE(dp, type, subtype) \
++	((GRUB_EFI_DEVICE_PATH_TYPE(dp) == (type)) && \
++	 (GRUB_EFI_DEVICE_PATH_SUBTYPE(dp) == (subtype)))
++
+ #define GRUB_EFI_DEVICE_PATH_TYPE(dp)		((dp)->type & 0x7f)
+ #define GRUB_EFI_DEVICE_PATH_SUBTYPE(dp)	((dp)->subtype)
+ #define GRUB_EFI_DEVICE_PATH_LENGTH(dp)		((dp)->length)

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;
- 

0068-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch

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

0069-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)
+ 	    {

0070-Warn-if-grub-password-will-not-be-read-1290803.patch

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

0071-Clean-up-grub-setpassword-documentation-1290799.patch

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

0072-Fix-locale-issue-in-grub-setpassword-1294243.patch

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

0073-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch

@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Robert Elliott <elliott@hpe.com>
+Date: Fri, 22 Jan 2016 13:32:30 +0100
+Subject: [PATCH] efiemu: Handle persistent RAM and unknown possible future
+ additions.
+
+(cherry picked from commit ae3b83a4d4df75a01198a2fed7542391e7c449e0)
+
+Resolves: rhbz#1288608
+---
+ grub-core/efiemu/mm.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c
+index 52a032f7b2e..92e7df7e501 100644
+--- a/grub-core/efiemu/mm.c
++++ b/grub-core/efiemu/mm.c
+@@ -410,8 +410,8 @@ fill_hook (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,
+ 	return grub_efiemu_add_to_mmap (addr, size,
+ 					GRUB_EFI_ACPI_MEMORY_NVS);
+ 
+-      case GRUB_MEMORY_PERSISTENT:
+-      case GRUB_MEMORY_PERSISTENT_LEGACY:
++      case GRUB_MEMORY_PRAM:
++      case GRUB_MEMORY_PMEM:
+ 	return grub_efiemu_add_to_mmap (addr, size,
+ 					GRUB_EFI_PERSISTENT_MEMORY);
+       default:

0074-efiemu-Fix-compilation-failure.patch

@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Vladimir Serbinenko <phcoder@gmail.com>
+Date: Fri, 22 Jan 2016 14:10:30 +0100
+Subject: [PATCH] efiemu: Fix compilation failure
+
+(cherry picked from commit b6a03dfd327489d53ee07c6d7d593b99c7b7cb62)
+
+Resolves: rhbz#1288608
+---
+ grub-core/efiemu/mm.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c
+index 92e7df7e501..52a032f7b2e 100644
+--- a/grub-core/efiemu/mm.c
++++ b/grub-core/efiemu/mm.c
+@@ -410,8 +410,8 @@ fill_hook (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,
+ 	return grub_efiemu_add_to_mmap (addr, size,
+ 					GRUB_EFI_ACPI_MEMORY_NVS);
+ 
+-      case GRUB_MEMORY_PRAM:
+-      case GRUB_MEMORY_PMEM:
++      case GRUB_MEMORY_PERSISTENT:
++      case GRUB_MEMORY_PERSISTENT_LEGACY:
+ 	return grub_efiemu_add_to_mmap (addr, size,
+ 					GRUB_EFI_PERSISTENT_MEMORY);
+       default:

0075-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch

@@ -0,0 +1,65 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 7 Apr 2016 10:58:06 -0400
+Subject: [PATCH] Revert "reopen SNP protocol for exclusive use by grub"
+
+I *think* this should have been replaced by upstream's
+49426e9fd2e562c73a4f1206f32eff9e424a1a73, so I'm reverting for now.
+
+May resolve rhbz#1273974.
+
+This reverts commit 147daeab22db793978f952b6f0d832919a1b0081.
+---
+ grub-core/net/drivers/efi/efinet.c | 39 --------------------------------------
+ 1 file changed, 39 deletions(-)
+
+diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
+index b870d3f1938..a3ce4c67cce 100644
+--- a/grub-core/net/drivers/efi/efinet.c
++++ b/grub-core/net/drivers/efi/efinet.c
+@@ -465,45 +465,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+ 				    &pxe_mode->dhcp_ack,
+ 				    sizeof (pxe_mode->dhcp_ack),
+ 				    1, device, path);
+-    net = grub_efi_open_protocol (card->efi_handle, &net_io_guid,
+-				  GRUB_EFI_OPEN_PROTOCOL_BY_EXCLUSIVE);
+-    if (net) {
+-      if (net->mode->state == GRUB_EFI_NETWORK_STOPPED
+-	  && efi_call_1 (net->start, net) != GRUB_EFI_SUCCESS)
+-	continue;
+-
+-      if (net->mode->state == GRUB_EFI_NETWORK_STOPPED)
+-	continue;
+-
+-      if (net->mode->state == GRUB_EFI_NETWORK_STARTED
+-	  && efi_call_3 (net->initialize, net, 0, 0) != GRUB_EFI_SUCCESS)
+-	continue;
+-
+-      /* Enable hardware receive filters if driver declares support for it.
+-	 We need unicast and broadcast and additionaly all nodes and
+-	 solicited multicast for IPv6. Solicited multicast is per-IPv6
+-	 address and we currently do not have API to do it so simply
+-	 try to enable receive of all multicast packets or evertyhing in
+-	 the worst case (i386 PXE driver always enables promiscuous too).
+-
+-	 This does trust firmware to do what it claims to do.
+-       */
+-      if (net->mode->receive_filter_mask)
+-	{
+-	  grub_uint32_t filters = GRUB_EFI_SIMPLE_NETWORK_RECEIVE_UNICAST   |
+-				  GRUB_EFI_SIMPLE_NETWORK_RECEIVE_BROADCAST |
+-				  GRUB_EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS_MULTICAST;
+-
+-	  filters &= net->mode->receive_filter_mask;
+-	  if (!(filters & GRUB_EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS_MULTICAST))
+-	    filters |= (net->mode->receive_filter_mask &
+-			GRUB_EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS);
+-
+-	  efi_call_6 (net->receive_filters, net, filters, 0, 0, 0, NULL);
+-	}
+-
+-      card->efi_net = net;
+-    }
+     return;
+   }
+ }

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

@@ -1,25 +1,33 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
-Date: Tue, 9 Jul 2019 11:47:37 +0200
+Date: Wed, 8 Jun 2016 21:03:37 -0400
 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 |  55 ++++++++++--
  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, 480 insertions(+), 14 deletions(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index abe45ef7bf6..02d2c2614cb 100644
+index f03eeab2fb4..da3e454466b 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>
  
- static grub_command_t cmd_getdhcp, cmd_bootp, cmd_dhcp;
+ static char *
+@@ -349,6 +350,179 @@ grub_net_configure_by_dhcp_ack (const char *name,
+   return inter;
+ }
  
 +struct grub_net_network_level_interface *
 +grub_net_configure_by_dhcpv6_ack (const char *name,
@@ -195,18 +203,19 @@ index abe45ef7bf6..02d2c2614cb 100644
 +
 +
  void
- grub_bootp_init (void)
- {
+ grub_net_process_dhcp (struct grub_net_buff *nb,
+ 		       struct grub_net_card *card)
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 3ea25cf9894..2af8742f904 100644
+index a3ce4c67cce..329024b6f2c 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,22 +225,25 @@ index 3ea25cf9894..2af8742f904 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -346,7 +349,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -409,7 +413,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)
+@@ -420,16 +424,22 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
      grub_efi_device_path_t *cdp;
      struct grub_efi_pxe *pxe;
      struct grub_efi_pxe_mode *pxe_mode;
 +
      if (card->driver != &efidriver)
        continue;
++
+     if (hnd != card->efi_handle)
+       continue;
 +
      cdp = grub_efi_get_device_path (card->efi_handle);
      if (! cdp)
@@ -246,7 +258,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,
+@@ -438,7 +448,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 +266,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,
+@@ -455,16 +464,46 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	if (!match)
  	  continue;
        }
@@ -265,6 +277,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 +293,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 16d2ce06d5a..4be228d9576 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 +402,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 97b9aa7a4d7..02488ec35ae 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 +454,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
+@@ -1454,16 +1460,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 +585,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 50d62ab0c8c..f8f3ec13acc 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
-@@ -450,6 +450,51 @@ struct grub_net_bootp_packet
+@@ -442,6 +442,51 @@ struct grub_net_bootp_packet
    grub_uint8_t vendor[0];
  } GRUB_PACKED;
  
@@ -666,7 +640,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,
+@@ -470,6 +515,21 @@ grub_net_configure_by_dhcp_ack (const char *name,
  				grub_size_t size,
  				int is_def, char **device, char **path);
  

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

@@ -10,24 +10,24 @@ 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 +
- 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.in               | 88 ++++++++++++++++++++++++++
+ configure.ac                                   |  2 +
+ Makefile.util.def                              |  7 +++
+ .gitignore                                     |  2 +
+ util/bash-completion.d/grub-completion.bash.in | 22 ++++++++
+ util/grub-get-kernel-settings.3                | 20 +++++++
+ util/grub-get-kernel-settings.in               | 78 ++++++++++++++++++++++++++
  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
+ util/grub.d/10_linux.in                        | 23 ++++++--
+ 8 files changed, 152 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 71d1056969e..aa06ed59c8d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -70,6 +70,7 @@ grub_TRANSFORM([grub-install])
+@@ -58,6 +58,7 @@ grub_TRANSFORM([grub-install])
  grub_TRANSFORM([grub-mkconfig])
  grub_TRANSFORM([grub-mkfont])
  grub_TRANSFORM([grub-mkimage])
@@ -35,11 +35,19 @@ index 493e336ec6c..3602b4ab62b 100644
  grub_TRANSFORM([grub-glue-efi])
  grub_TRANSFORM([grub-mklayout])
  grub_TRANSFORM([grub-mkpasswd-pbkdf2])
+@@ -75,6 +76,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 fd91045bd6d..2d032643de7 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -725,6 +725,13 @@ script = {
+@@ -714,6 +714,13 @@ script = {
    installdir = sbin;
  };
  
@@ -53,19 +61,24 @@ 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/.gitignore b/.gitignore
+index 5066689bc0a..54795fa60be 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -68,6 +68,8 @@ grub-*.tar.*
+ /grub*-fs-tester
+ /grub*-fstest
+ /grub*-fstest.1
++/grub*-get-kernel-settings
++/grub*-get-kernel-settings.3
+ /grub*-glue-efi
+ /grub*-glue-efi.1
+ /grub*-install
 diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in
-index 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,12 +107,38 @@ 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
+index 00000000000..12046219878
 --- /dev/null
 +++ b/util/grub-get-kernel-settings.in
-@@ -0,0 +1,88 @@
+@@ -0,0 +1,78 @@
 +#!/bin/sh
 +set -e
 +
@@ -178,18 +217,8 @@ index 00000000000..7e87dfccc0e
 +    echo GRUB_LINUX_DEBUG_TITLE_POSTFIX=\" with debugging\"
 +    echo export GRUB_LINUX_DEBUG_TITLE_POSTFIX
 +fi
-+if [ "$DEFAULTDEBUG" = "yes" ]; then
-+    echo GRUB_DEFAULT_TO_DEBUG=true
-+else
-+    echo GRUB_DEFAULT_TO_DEBUG=false
-+fi
-+echo export GRUB_DEFAULT_TO_DEBUG
-+if [ "$UPDATEDEFAULT" = "yes" ]; then
-+    echo GRUB_UPDATE_DEFAULT_KERNEL=true
-+    echo export GRUB_UPDATE_DEFAULT_KERNEL
-+fi
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 5f2824d4f58..28e92515795 100644
+index bdb9982aefb..8218f3d477f 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -45,6 +45,7 @@ grub_probe="${sbindir}/@grub_probe@"
@@ -206,14 +235,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 a8a8e2cf325..4e49ccdf742 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 +252,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 +262,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 +280,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 +295,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
+ 

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

@@ -0,0 +1,55 @@
+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: Peter Jones <pjones@redhat.com>
+---
+ grub-core/net/tftp.c | 24 +++++++++++++++++++++++-
+ 1 file changed, 23 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
+index 1157524fc50..5ca0a96a6f6 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,7 +356,10 @@ 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);
++
++  /* 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 (filename) + 1;
+   rrq += grub_strlen (filename) + 1;
+ 

0080-Fix-malformed-tftp-packets.patch

@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mark Salter <msalter@redhat.com>
+Date: Tue, 7 Mar 2017 18:26:17 -0500
+Subject: [PATCH] Fix malformed tftp packets
+
+0088-Normalize-slashes-in-tftp-paths.patch collapses multiple contiguous
+slashes in a filename into one slash in the tftp packet filename field.
+However, the packet buffer pointer is advanced using the original name.
+This leaves unitialized data between the name field and the type field
+leading to tftp errors. Use the length of the normalized name to avoid
+this.
+
+Signed-off-by: Mark Salter <msalter@redhat.com>
+---
+ grub-core/net/tftp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
+index 5ca0a96a6f6..dcd82494309 100644
+--- a/grub-core/net/tftp.c
++++ b/grub-core/net/tftp.c
+@@ -360,8 +360,8 @@ tftp_open (struct grub_file *file, const char *filename)
+   /* 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 (filename) + 1;
+-  rrq += grub_strlen (filename) + 1;
++  rrqlen += grub_strlen (rrq) + 1;
++  rrq += grub_strlen (rrq) + 1;
+ 
+   grub_strcpy (rrq, "octet");
+   rrqlen += grub_strlen ("octet") + 1;

0081-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 002446be1c3..3df75357a70 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)

0082-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 991891a6e09..27563743ba9 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -199,6 +199,9 @@ kernel = {
+@@ -175,6 +175,9 @@ kernel = {
  
    softdiv = lib/division.c;
  
@@ -25,21 +25,21 @@ index 47c0fc755a2..63f053b3add 100644
 +
    i386 = kern/i386/dl.c;
    i386_xen = kern/i386/dl.c;
-   i386_xen_pvh = kern/i386/dl.c;
+ 
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 11037dc0227..465a8e74ea7 100644
+index f1fab700048..5ce89a40c68 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

0083-Make-grub-editenv-build-again.patch

@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Fri, 4 Mar 2016 16:29:13 -0500
+Subject: [PATCH] Make grub-editenv build again.
+
+36212460d3565b18439a3a8130b28e6c97702c6a split how some of the mkimage
+utility functions are defined, and they wind up being linked into
+grub-editenv.  Most utilities got fixed, but this one was missed.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ Makefile.util.def | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile.util.def b/Makefile.util.def
+index 2d032643de7..879e8eb98a4 100644
+--- a/Makefile.util.def
++++ b/Makefile.util.def
+@@ -237,6 +237,8 @@ program = {
+   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;

0084-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 aa06ed59c8d..f69f8986791 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,6 +80,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])
+@@ -98,6 +99,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"