add bls stuff

Signed-off-by: Peter Jones <pjones@redhat.com>

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

@@ -1,7 +1,7 @@
 From e32c57d2abd034cbdea24a8f51de8dbef453bd96 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Thu, 20 Sep 2012 18:07:39 -0300
-Subject: [PATCH 01/87] IBM client architecture (CAS) reboot support
+Subject: [PATCH 01/90] IBM client architecture (CAS) reboot support
 
 This is an implementation of IBM client architecture (CAS) reboot for GRUB.
 
@@ -170,5 +170,5 @@ index 8e42513..9f26c69 100644
  #define FOR_IEEE1275_DEVALIASES(alias) for (grub_ieee1275_devalias_init_iterator (&(alias)); grub_ieee1275_devalias_next (&(alias));)
  
 -- 
-2.7.4
+2.9.3
 

0001-Make-blscfg-include-some-IDs-and-indices.patch

@@ -0,0 +1,86 @@
+From 3f2d8bc3a052c7ab6f89a7684ac93b0f8401a6b5 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Fri, 28 Oct 2016 10:55:56 -0400
+Subject: [PATCH] Make blscfg include some IDs and indices
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/commands/blscfg.c | 27 +++++++++++++++++++++++----
+ 1 file changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
+index af838d2..2a16858 100644
+--- a/grub-core/commands/blscfg.c
++++ b/grub-core/commands/blscfg.c
+@@ -56,6 +56,9 @@ static int parse_entry (
+   grub_file_t f = NULL;
+   grub_off_t sz;
+   char *title = NULL, *options = NULL, *clinux = NULL, *initrd = NULL, *src = NULL;
++  char *id = NULL;
++  char *class[] = { NULL, NULL };
++  char **classes = class[0];
+   const char *args[2] = { NULL, NULL };
+   const char *dirname = (const char *)data;
+   const char *devid = grub_env_get ("boot");
+@@ -120,6 +123,20 @@ static int parse_entry (
+ 	  if (!initrd)
+ 	    goto finish;
+ 	}
++      else if (grub_strncmp (buf, "id ", 3) == 0)
++	{
++	  grub_free (id);
++	  id = grub_strdup (buf + 3);
++	  if (!id)
++	    goto finish;
++	}
++      else if (grub_strncmp (buf, "index ", 6) == 0)
++	{
++	  grub_free (class[0]);
++	  class[0] = grub_strdup (buf + 6);
++	  if (!class[0])
++	    goto finish;
++	}
+ 
+       grub_free(buf);
+     }
+@@ -141,7 +158,7 @@ static int parse_entry (
+ 			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);
++  grub_normal_add_menu_entry (1, args, classes, id, "bls", NULL, NULL, src, 0);
+ 
+ finish:
+   grub_free (p);
+@@ -150,6 +167,8 @@ finish:
+   grub_free (clinux);
+   grub_free (initrd);
+   grub_free (src);
++  grub_free (id);
++  grub_free (class[0]);
+ 
+   if (f)
+     grub_file_close (f);
+@@ -333,7 +352,7 @@ finish:
+ #endif
+ 
+ static grub_err_t
+-grub_cmd_bls_import (grub_extcmd_context_t ctxt __attribute__ ((unused)),
++grub_cmd_blscfg (grub_extcmd_context_t ctxt __attribute__ ((unused)),
+ 		     int argc __attribute__ ((unused)),
+ 		     char **args __attribute__ ((unused)))
+ {
+@@ -384,8 +403,8 @@ static grub_extcmd_t cmd;
+ 
+ GRUB_MOD_INIT(bls)
+ {
+-  cmd = grub_register_extcmd ("bls_import",
+-			      grub_cmd_bls_import,
++  cmd = grub_register_extcmd ("blscfg",
++			      grub_cmd_blscfg,
+ 			      0,
+ 			      NULL,
+ 			      N_("Import Boot Loader Specification snippets."),
+-- 
+2.9.3
+

0001-blscfg-make-the-bls_import-command-know-to-search-en.patch

@@ -0,0 +1,531 @@
+From 00857b7fb451f2abf9e97229aef537dab3d56f6e Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 24 Oct 2016 14:51:06 -0400
+Subject: [PATCH 1/2] blscfg: make the bls_import command know to search env
+ files for blsdir
+
+This makes it so when you do "bls_import" on EFI systems, it searches
+/EFI/*/ directories for a grubenv, and if it finds it, temporarily
+merges that environment into grub's env.
+
+Once that is done, if there's a variable named "blsdir", it looks there
+for BLS config files.  If that is absent, it tries to load them from
+/EFI/$DIR/loader/entries/
+---
+ grub-core/commands/blscfg.c  | 219 ++++++++++++++++++++++++++++++++++++++++---
+ grub-core/commands/loadenv.c |  77 +--------------
+ grub-core/commands/loadenv.h |  93 ++++++++++++++++++
+ include/grub/compiler.h      |   2 +
+ 4 files changed, 305 insertions(+), 86 deletions(-)
+ create mode 100644 grub-core/commands/loadenv.h
+
+diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
+index 4274aca..af838d2 100644
+--- a/grub-core/commands/blscfg.c
++++ b/grub-core/commands/blscfg.c
+@@ -30,25 +30,26 @@
+ #include <grub/env.h>
+ #include <grub/file.h>
+ #include <grub/normal.h>
++#include <grub/lib/envblk.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
++#include "loadenv.h"
++
++#define GRUB_BLS_CONFIG_PATH "/loader/entries/"
++#define GRUB_BOOT_DEVICE "($root)"
+ #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)))
++    const struct grub_dirhook_info *info UNUSED,
++    void *data)
+ {
+   grub_size_t n;
+   char *p;
+@@ -56,6 +57,10 @@ static int parse_entry (
+   grub_off_t sz;
+   char *title = NULL, *options = NULL, *clinux = NULL, *initrd = NULL, *src = NULL;
+   const char *args[2] = { NULL, NULL };
++  const char *dirname = (const char *)data;
++  const char *devid = grub_env_get ("boot");
++
++  grub_dprintf ("blscfg", "filename: \"%s\"\n", filename);
+ 
+   if (filename[0] == '.')
+     return 0;
+@@ -67,12 +72,14 @@ static int parse_entry (
+   if (grub_strcmp (filename + n - 5, ".conf") != 0)
+     return 0;
+ 
+-  p = grub_xasprintf (GRUB_BLS_CONFIG_PATH "%s", filename);
++  p = grub_xasprintf ("(%s)%s/%s", devid, dirname, filename);
++  grub_dprintf ("blscfg", "entry path: \"%s\"\n", p);
+ 
+   f = grub_file_open (p);
+   if (!f)
+     goto finish;
+ 
++  grub_dprintf ("blscfg", "getting size\n");
+   sz = grub_file_size (f);
+   if (sz == GRUB_FILE_SIZE_UNKNOWN || sz > 1024*1024)
+     goto finish;
+@@ -119,12 +126,13 @@ static int parse_entry (
+ 
+   if (!linux)
+     {
+-      grub_printf ("Skipping file %s with no 'linux' key.", p);
++      grub_dprintf ("blscfg", "Skipping file %s with no 'linux' key.", p);
+       goto finish;
+     }
+ 
+   args[0] = title ? title : filename;
+ 
++  grub_dprintf("blscfg", "adding menu entry for \"%s\"\n", clinux);
+   src = grub_xasprintf ("load_video\n"
+ 			"set gfx_payload=keep\n"
+ 			"insmod gzio\n"
+@@ -149,6 +157,181 @@ finish:
+   return 0;
+ }
+ 
++#ifdef GRUB_MACHINE_EFI
++static grub_envblk_t saved_env = NULL;
++
++static int
++save_var (const char *name, const char *value, void *whitelist UNUSED)
++{
++  const char *val = grub_env_get (name);
++  grub_dprintf("blscfg", "saving \"%s\"\n", name);
++
++  if (val)
++    grub_envblk_set (saved_env, name, value);
++
++  return 0;
++}
++
++static int
++unset_var (const char *name, const char *value UNUSED, void *whitelist)
++{
++  grub_dprintf("blscfg", "restoring \"%s\"\n", name);
++  if (! whitelist)
++    {
++      grub_env_unset (name);
++      return 0;
++    }
++
++  if (test_whitelist_membership (name,
++				 (const grub_env_whitelist_t *) whitelist))
++    grub_env_unset (name);
++
++  return 0;
++}
++
++struct find_entry_info {
++	grub_device_t dev;
++	grub_fs_t fs;
++};
++
++/*
++ * filename: if the directory is /EFI/something/ , filename is "something"
++ * info: unused
++ * data: the filesystem object the file is on.
++ */
++static int find_entry (const char *filename,
++		       const struct grub_dirhook_info *dirhook_info UNUSED,
++		       void *data)
++{
++  struct find_entry_info *info = (struct find_entry_info *)data;
++  grub_file_t f = NULL;
++  char *grubenv_path = NULL;
++  grub_envblk_t env = NULL;
++  char *default_blsdir = NULL;
++  const char *blsdir = NULL;
++  char *saved_env_buf = NULL;
++  grub_size_t l;
++  int r = 0;
++  const char *devid = grub_env_get ("boot");
++
++  if (!grub_strcmp (filename, ".") ||
++      !grub_strcmp (filename, "..") ||
++      !grub_strcasecmp (filename, "boot"))
++    return 0;
++
++  saved_env_buf = grub_malloc (512);
++
++  // set a default blsdir
++  default_blsdir = grub_xasprintf ("/EFI/%s%s", filename,
++				   GRUB_BLS_CONFIG_PATH);
++  grub_env_set ("blsdir", default_blsdir);
++  grub_dprintf ("blscfg", "default_blsdir: \"%s\"\n", default_blsdir);
++
++  /*
++   * try to load a grubenv from /EFI/wherever/grubenv
++   */
++  grubenv_path = grub_xasprintf ("(%s)/EFI/%s/grubenv", devid, filename);
++  grub_dprintf ("blscfg", "looking for \"%s\"\n", grubenv_path);
++  f = grub_file_open (grubenv_path);
++
++  grub_dprintf ("blscfg", "%s it\n", f ? "found" : "did not find");
++  grub_free (grubenv_path);
++  if (f)
++    {
++      grub_off_t sz;
++
++      grub_dprintf ("blscfg", "getting size\n");
++      sz = grub_file_size (f);
++      if (sz == GRUB_FILE_SIZE_UNKNOWN || sz > 1024*1024)
++	goto finish;
++
++      grub_dprintf ("blscfg", "reading env\n");
++      env = read_envblk_file (f);
++      if (!env)
++	goto finish;
++      grub_dprintf ("blscfg", "read env file\n");
++
++      grub_memset (saved_env_buf, '#', 512);
++      grub_memcpy (saved_env_buf, GRUB_ENVBLK_SIGNATURE,
++		   sizeof (GRUB_ENVBLK_SIGNATURE));
++      grub_dprintf ("blscfg", "saving env\n");
++      saved_env = grub_envblk_open (saved_env_buf, 512);
++      if (!saved_env)
++	goto finish;
++
++      // save everything listed in "env" with values from our existing grub env
++      grub_envblk_iterate (env, NULL, save_var);
++      // set everything from our loaded grubenv into the real grub env
++      grub_envblk_iterate (env, NULL, set_var);
++    }
++  else
++    {
++      grub_err_t e;
++      grub_dprintf ("blscfg", "no such file\n");
++      do
++	{
++	  e = grub_error_pop();
++	} while (e);
++
++    }
++
++  blsdir = grub_env_get ("blsdir");
++  if (!blsdir)
++    goto finish;
++
++  grub_dprintf ("blscfg", "blsdir: \"%s\"\n", blsdir);
++  if (blsdir[0] != '/')
++    blsdir = grub_xasprintf ("/EFI/%s/%s/", filename, blsdir);
++  else
++    blsdir = grub_strdup (blsdir);
++
++  if (!blsdir)
++    goto finish;
++
++  grub_dprintf ("blscfg", "blsdir: \"%s\"\n", blsdir);
++  r = info->fs->dir (info->dev, blsdir, parse_entry, (char *)blsdir);
++  if (r != 0) {
++      grub_dprintf ("blscfg", "parse_entry returned error\n");
++      grub_err_t e;
++      do
++	{
++	  e = grub_error_pop();
++	} while (e);
++  }
++
++finish:
++  grub_free (blsdir);
++
++  grub_env_unset ("blsdir");
++
++  if (saved_env)
++    {
++      // remove everything from the real environment that's defined in env
++      grub_envblk_iterate (env, NULL, unset_var);
++
++      // re-set the things from our original environment
++      grub_envblk_iterate (saved_env, NULL, set_var);
++      grub_envblk_close (saved_env);
++      saved_env = NULL;
++    }
++  else if (saved_env_buf)
++    {
++      // if we have a saved environment, grub_envblk_close() freed this.
++      grub_free (saved_env_buf);
++    }
++
++  if (env)
++    grub_envblk_close (env);
++
++  if (f)
++    grub_file_close (f);
++
++  grub_free (default_blsdir);
++
++  return 0;
++}
++#endif
++
+ static grub_err_t
+ grub_cmd_bls_import (grub_extcmd_context_t ctxt __attribute__ ((unused)),
+ 		     int argc __attribute__ ((unused)),
+@@ -158,15 +341,22 @@ grub_cmd_bls_import (grub_extcmd_context_t ctxt __attribute__ ((unused)),
+   grub_device_t dev;
+   static grub_err_t r;
+   const char *devid;
++#ifdef GRUB_MACHINE_EFI
++  struct find_entry_info info;
++#endif
+ 
+-  devid = grub_env_get ("root");
++  grub_dprintf ("blscfg", "finding boot\n");
++  devid = grub_env_get ("boot");
+   if (!devid)
+-    return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("variable `%s' isn't set"), "root");
++    return grub_error (GRUB_ERR_FILE_NOT_FOUND,
++		       N_("variable `%s' isn't set"), "boot");
+ 
++  grub_dprintf ("blscfg", "opening %s\n", devid);
+   dev = grub_device_open (devid);
+   if (!dev)
+     return grub_errno;
+ 
++  grub_dprintf ("blscfg", "probing fs\n");
+   fs = grub_fs_probe (dev);
+   if (!fs)
+     {
+@@ -174,7 +364,14 @@ grub_cmd_bls_import (grub_extcmd_context_t ctxt __attribute__ ((unused)),
+       goto finish;
+     }
+ 
+-  r = fs->dir (dev, GRUB_BLS_CONFIG_PATH, parse_entry, NULL);
++#ifdef GRUB_MACHINE_EFI
++  info.dev = dev;
++  info.fs = fs;
++  grub_dprintf ("blscfg", "scanning /EFI/\n");
++  r = fs->dir (dev, "/EFI/", find_entry, &info);
++#else
++  r = fs->dir (dev, GRUB_BLS_CONFIG_PATH, parse_entry, GRUB_BLS_CONFIG_PATH);
++#endif
+ 
+ finish:
+   if (dev)
+diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
+index acd93d1..91c9945 100644
+--- a/grub-core/commands/loadenv.c
++++ b/grub-core/commands/loadenv.c
+@@ -28,6 +28,8 @@
+ #include <grub/extcmd.h>
+ #include <grub/i18n.h>
+ 
++#include "loadenv.h"
++
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+ static const struct grub_arg_option options[] =
+@@ -84,81 +86,6 @@ open_envblk_file (char *filename, int untrusted)
+   return file;
+ }
+ 
+-static grub_envblk_t
+-read_envblk_file (grub_file_t file)
+-{
+-  grub_off_t offset = 0;
+-  char *buf;
+-  grub_size_t size = grub_file_size (file);
+-  grub_envblk_t envblk;
+-
+-  buf = grub_malloc (size);
+-  if (! buf)
+-    return 0;
+-
+-  while (size > 0)
+-    {
+-      grub_ssize_t ret;
+-
+-      ret = grub_file_read (file, buf + offset, size);
+-      if (ret <= 0)
+-        {
+-          grub_free (buf);
+-          return 0;
+-        }
+-
+-      size -= ret;
+-      offset += ret;
+-    }
+-
+-  envblk = grub_envblk_open (buf, offset);
+-  if (! envblk)
+-    {
+-      grub_free (buf);
+-      grub_error (GRUB_ERR_BAD_FILE_TYPE, "invalid environment block");
+-      return 0;
+-    }
+-
+-  return envblk;
+-}
+-
+-struct grub_env_whitelist
+-{
+-  grub_size_t len;
+-  char **list;
+-};
+-typedef struct grub_env_whitelist grub_env_whitelist_t;
+-
+-static int
+-test_whitelist_membership (const char* name,
+-                           const grub_env_whitelist_t* whitelist)
+-{
+-  grub_size_t i;
+-
+-  for (i = 0; i < whitelist->len; i++)
+-    if (grub_strcmp (name, whitelist->list[i]) == 0)
+-      return 1;  /* found it */
+-
+-  return 0;  /* not found */
+-}
+-
+-/* Helper for grub_cmd_load_env.  */
+-static int
+-set_var (const char *name, const char *value, void *whitelist)
+-{
+-  if (! whitelist)
+-    {
+-      grub_env_set (name, value);
+-      return 0;
+-    }
+-
+-  if (test_whitelist_membership (name,
+-				 (const grub_env_whitelist_t *) whitelist))
+-    grub_env_set (name, value);
+-
+-  return 0;
+-}
+-
+ static grub_err_t
+ grub_cmd_load_env (grub_extcmd_context_t ctxt, int argc, char **args)
+ {
+diff --git a/grub-core/commands/loadenv.h b/grub-core/commands/loadenv.h
+new file mode 100644
+index 0000000..952f461
+--- /dev/null
++++ b/grub-core/commands/loadenv.h
+@@ -0,0 +1,93 @@
++/* loadenv.c - command to load/save environment variable.  */
++/*
++ *  GRUB  --  GRand Unified Bootloader
++ *  Copyright (C) 2008,2009,2010  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/>.
++ */
++
++static grub_envblk_t UNUSED
++read_envblk_file (grub_file_t file)
++{
++  grub_off_t offset = 0;
++  char *buf;
++  grub_size_t size = grub_file_size (file);
++  grub_envblk_t envblk;
++
++  buf = grub_malloc (size);
++  if (! buf)
++    return 0;
++
++  while (size > 0)
++    {
++      grub_ssize_t ret;
++
++      ret = grub_file_read (file, buf + offset, size);
++      if (ret <= 0)
++        {
++          grub_free (buf);
++          return 0;
++        }
++
++      size -= ret;
++      offset += ret;
++    }
++
++  envblk = grub_envblk_open (buf, offset);
++  if (! envblk)
++    {
++      grub_free (buf);
++      grub_error (GRUB_ERR_BAD_FILE_TYPE, "invalid environment block");
++      return 0;
++    }
++
++  return envblk;
++}
++
++struct grub_env_whitelist
++{
++  grub_size_t len;
++  char **list;
++};
++typedef struct grub_env_whitelist grub_env_whitelist_t;
++
++static int UNUSED
++test_whitelist_membership (const char* name,
++                           const grub_env_whitelist_t* whitelist)
++{
++  grub_size_t i;
++
++  for (i = 0; i < whitelist->len; i++)
++    if (grub_strcmp (name, whitelist->list[i]) == 0)
++      return 1;  /* found it */
++
++  return 0;  /* not found */
++}
++
++/* Helper for grub_cmd_load_env.  */
++static int UNUSED
++set_var (const char *name, const char *value, void *whitelist)
++{
++  if (! whitelist)
++    {
++      grub_env_set (name, value);
++      return 0;
++    }
++
++  if (test_whitelist_membership (name,
++				 (const grub_env_whitelist_t *) whitelist))
++    grub_env_set (name, value);
++
++  return 0;
++}
+diff --git a/include/grub/compiler.h b/include/grub/compiler.h
+index c9e1d7a..9859ff4 100644
+--- a/include/grub/compiler.h
++++ b/include/grub/compiler.h
+@@ -48,4 +48,6 @@
+ #  define WARN_UNUSED_RESULT
+ #endif
+ 
++#define UNUSED __attribute__((__unused__))
++
+ #endif /* ! GRUB_COMPILER_HEADER */
+-- 
+2.9.3
+

0002-Make-grub2-mkconfig-able-to-output-BLS-based-config-.patch

@@ -0,0 +1,125 @@
+From 7d96844d560e9a4ce14f785abbb4b9d25ee49987 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 25 Oct 2016 13:26:38 -0400
+Subject: [PATCH 2/2] Make grub2-mkconfig able to output BLS based config file
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ util/grub-mkconfig.in     |  3 ++-
+ util/grub-mkconfig_lib.in | 24 +++++++++++++++---------
+ util/grub.d/10_linux.in   | 20 ++++++++++++++++++++
+ 3 files changed, 37 insertions(+), 10 deletions(-)
+
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index e32de5e..0e0475d 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -239,7 +239,8 @@ export GRUB_DEFAULT \
+   GRUB_BADRAM \
+   GRUB_OS_PROBER_SKIP_LIST \
+   GRUB_DISABLE_SUBMENU \
+-  GRUB_DEFAULT_DTB
++  GRUB_DEFAULT_DTB \
++  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 9c410ea..54b3576 100644
+--- a/util/grub-mkconfig_lib.in
++++ b/util/grub-mkconfig_lib.in
+@@ -123,10 +123,16 @@ EOF
+ 
+ prepare_grub_to_access_device ()
+ {
++  local device=$1 && shift
++  if [ "$#" -gt 0 ]; then
++    local variable=$1 && shift
++  else
++    local variable=root
++  fi
+   old_ifs="$IFS"
+   IFS='
+ '
+-  partmap="`"${grub_probe}" --device $@ --target=partmap`"
++  partmap="`"${grub_probe}" --device ${device} --target=partmap`"
+   for module in ${partmap} ; do
+     case "${module}" in
+       netbsd | openbsd)
+@@ -137,34 +143,34 @@ prepare_grub_to_access_device ()
+   done
+ 
+   # Abstraction modules aren't auto-loaded.
+-  abstraction="`"${grub_probe}" --device $@ --target=abstraction`"
++  abstraction="`"${grub_probe}" --device ${device} --target=abstraction`"
+   for module in ${abstraction} ; do
+     echo "insmod ${module}"
+   done
+ 
+-  fs="`"${grub_probe}" --device $@ --target=fs`"
++  fs="`"${grub_probe}" --device ${device} --target=fs`"
+   for module in ${fs} ; do
+     echo "insmod ${module}"
+   done
+ 
+   if [ x$GRUB_ENABLE_CRYPTODISK = xy ]; then
+-      for uuid in `"${grub_probe}" --device $@ --target=cryptodisk_uuid`; do
++      for uuid in `"${grub_probe}" --device ${device} --target=cryptodisk_uuid`; do
+ 	  echo "cryptomount -u $uuid"
+       done
+   fi
+ 
+   # If there's a filesystem UUID that GRUB is capable of identifying, use it;
+   # otherwise set root as per value in device.map.
+-  fs_hint="`"${grub_probe}" --device $@ --target=compatibility_hint`"
++  fs_hint="`"${grub_probe}" --device ${device} --target=compatibility_hint`"
+   if [ "x$fs_hint" != x ]; then
+     echo "set root='$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$GRUB_DISABLE_UUID" != "xtrue" ] && fs_uuid="`"${grub_probe}" --device ${device} --target=fs_uuid 2> /dev/null`" ; then
++    hints="`"${grub_probe}" --device ${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}"
++    echo "  search --no-floppy --fs-uuid --set=${variable} ${hints} ${fs_uuid}"
+     echo "else"
+-    echo "  search --no-floppy --fs-uuid --set=root ${fs_uuid}"
++    echo "  search --no-floppy --fs-uuid --set=${variable} ${fs_uuid}"
+     echo "fi"
+   fi
+   IFS="$old_ifs"
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 0c5b227..8d31b1d 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -105,6 +105,26 @@ linux_entry ()
+   if [ -z "$boot_device_id" ]; then
+       boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
+   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
++
++    bootefi_device="`${grub_probe} --target=device /boot/efi/`"
++    prepare_grub_to_access_device ${bootefi_device} boot
++
++    echo bls_import
++
++    exit 0
++  fi
++
+   if [ x$type != xsimple ] ; then
+       case $type in
+ 	  recovery)
+-- 
+2.9.3
+

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

@@ -1,7 +1,7 @@
 From 4f82466e3b1fcf3370d82432e406f51906e1fa46 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Wed, 24 Apr 2013 10:51:48 -0300
-Subject: [PATCH 02/87] for ppc, reset console display attr when clear screen
+Subject: [PATCH 02/90] for ppc, reset console display attr when clear screen
 
 v2: Also use \x0c instead of a literal ^L to make future patches less
 awkward.
@@ -28,5 +28,5 @@ index f0d3e3d..9bb75c1 100644
        data->reverse_video_off = grub_strdup ("\e[m");
        if (grub_strcmp ("ieee1275", str) == 0)
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 9cff6efa3a7e15a6968fed29a29f38713da864fd Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 11 Jun 2013 15:14:05 -0300
-Subject: [PATCH 03/87] Disable GRUB video support for IBM power machines
+Subject: [PATCH 03/90] Disable GRUB video support for IBM power machines
 
 Should fix the problem in bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=973205
@@ -61,5 +61,5 @@ index 9f26c69..ab4f284 100644
  
  extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);
 -- 
-2.7.4
+2.9.3
 

0004-Fix-bzr-s-ignore-artificats-in-.gitignore.patch

@@ -1,7 +1,7 @@
 From 512fe6865738286c94f87da64ca6b475bc3e2f38 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 7 Jul 2015 10:13:14 -0400
-Subject: [PATCH 04/87] Fix bzr's ignore artificats in .gitignore
+Subject: [PATCH 04/90] Fix bzr's ignore artificats in .gitignore
 
 We lost a man page because of incompatibilities between bzr's ignore
 system and .gitignore, so solve that slightly better.
@@ -367,5 +367,5 @@ index 18ab8e8..06c9f3a 100644
 -/grub-fs-tester
 +xzcompress_test
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 7f1ea377390345b8ef7609ad0fa2952708b17e19 Mon Sep 17 00:00:00 2001
 From: Marcel Kolaja <mkolaja@redhat.com>
 Date: Tue, 21 Jan 2014 10:57:08 -0500
-Subject: [PATCH 05/87] Honor a symlink when generating configuration by
+Subject: [PATCH 05/90] Honor a symlink when generating configuration by
  grub2-mkconfig
 
 Honor a symlink when generating configuration by grub2-mkconfig, so that
@@ -25,5 +25,5 @@ index f8496d2..3b070fd 100644
  fi
  
 -- 
-2.7.4
+2.9.3
 

0006-Move-bash-completion-script-922997.patch

@@ -1,7 +1,7 @@
 From 5b77e510eb6e4b649c53ab0790cdc9fdf0c85be9 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Apr 2013 14:35:34 -0400
-Subject: [PATCH 06/87] Move bash completion script (#922997)
+Subject: [PATCH 06/90] Move bash completion script (#922997)
 
 Apparently these go in a new place now.
 ---
@@ -51,5 +51,5 @@ index 136287c..61108f0 100644
  
  $(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status
 -- 
-2.7.4
+2.9.3
 

0007-Update-to-minilzo-2.08.patch

@@ -1,7 +1,7 @@
 From 579ecb682efc5221b4a13b8009af1731f5349912 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Dec 2014 15:36:09 -0500
-Subject: [PATCH 07/87] Update to minilzo-2.08
+Subject: [PATCH 07/90] Update to minilzo-2.08
 
 This fixes CVE-2014-4607 - lzo: lzo1x_decompress_safe() integer overflow
 
@@ -8786,5 +8786,5 @@ index 74fefa9..7937454 100644
  
  
 -- 
-2.7.4
+2.9.3
 

0008-Add-vlan-tag-support-on-IBM-PPC-machines.patch

@@ -1,7 +1,7 @@
 From de423b22780b0fd225a1ee476166777af29d53d0 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 30 Oct 2012 15:19:39 -0200
-Subject: [PATCH 08/87] Add vlan-tag support on IBM PPC machines
+Subject: [PATCH 08/90] Add vlan-tag support on IBM PPC machines
 
 This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging allows
 multiple VLANs in a bridged network to share the same physical network link but
@@ -182,5 +182,5 @@ index 2192fa1..6ac9d72 100644
 +
  #endif /* ! GRUB_NET_HEADER */
 -- 
-2.7.4
+2.9.3
 

0009-Allow-fallback-to-include-entries-by-title-not-just-.patch

@@ -1,7 +1,7 @@
 From 196ae5abd961cd64b60d9ab41bfc02d340e8bb6f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 5 Sep 2014 10:07:04 -0400
-Subject: [PATCH 09/87] Allow "fallback" to include entries by title, not just
+Subject: [PATCH 09/90] Allow "fallback" to include entries by title, not just
  number.
 
 Resolves: rhbz#1026084
@@ -140,5 +140,5 @@ index 719e2fb..2e8a7bd 100644
  static int
  get_entry_number (grub_menu_t menu, const char *name)
 -- 
-2.7.4
+2.9.3
 

0010-Add-GRUB_DISABLE_UUID.patch

@@ -1,7 +1,7 @@
 From 8f405e93871ad51cd9ab4dfdea844042a33fa7f0 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 16:49:25 -0400
-Subject: [PATCH 10/87] Add GRUB_DISABLE_UUID.
+Subject: [PATCH 10/90] 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
@@ -95,5 +95,5 @@ index 60b31ca..cf35e41 100644
    else
      echo $device |sed 's, ,_,g'
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 6879936079d17ace35cebcab787f7fb9f8cd205e Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 26 Feb 2014 21:49:12 -0500
-Subject: [PATCH 11/87] Make "exit" take a return code.
+Subject: [PATCH 11/90] Make "exit" take a return code.
 
 This adds "exit" with a return code.  With this patch, any "exit"
 command /may/ include a return code, and on platforms that support
@@ -255,5 +255,5 @@ index 2a9f87c..0620814 100644
  					  grub_uint64_t d,
  					  grub_uint64_t *r);
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From ef756db92dd4f47ed4bb4aede86d33326b0b9188 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 22 Jul 2015 11:21:01 -0400
-Subject: [PATCH 12/87] Mark po/exclude.pot as binary so git won't try to diff
+Subject: [PATCH 12/90] Mark po/exclude.pot as binary so git won't try to diff
  nonprintables.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -18,5 +18,5 @@ index 0000000..33ffaa4
 @@ -0,0 +1 @@
 +po/exclude.pot binary
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From e14c5369fea76d1e067ca9f7e5e55bfe615cb639 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 7 Dec 2015 14:20:49 -0500
-Subject: [PATCH 13/87] Make efi machines load an env block from a variable
+Subject: [PATCH 13/90] Make efi machines load an env block from a variable
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -80,5 +80,5 @@ index e9c85de..a5b6c1d 100644
  			     char **path);
  
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 12fb24b4d8a8f0fd7f79bc224157c290ebab31f4 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 14/87] DHCP client ID and UUID options added.
+Subject: [PATCH 14/90] DHCP client ID and UUID options added.
 
 ---
  grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----
@@ -141,5 +141,5 @@ index 6ac9d72..96aa9fa 100644
    };
  
 -- 
-2.7.4
+2.9.3
 

0015-trim-arp-packets-with-abnormal-size.patch

@@ -1,7 +1,7 @@
 From a6f4624278357f853e3e8888e538eb0ef3654556 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 15/87] trim arp packets with abnormal size
+Subject: [PATCH 15/90] 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.
@@ -27,5 +27,5 @@ index 4b68c41..f7c59d3 100644
  	struct grub_net_buff nb_reply;
  	struct arppkt *arp_reply;
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From c22139b340f1a306ad718646a4cd4bc1d4039d7b Mon Sep 17 00:00:00 2001
 From: Prarit Bhargava <prarit@redhat.com>
 Date: Wed, 12 Mar 2014 10:58:16 -0400
-Subject: [PATCH 16/87] Fix bad test on GRUB_DISABLE_SUBMENU.
+Subject: [PATCH 16/90] Fix bad test on GRUB_DISABLE_SUBMENU.
 
 The file /etc/grub.d/10_linux does
 
@@ -37,5 +37,5 @@ index de9044c..cf6331f 100644
      "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
  
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From f0daa044a90c508f8f60d23e5ef39597ec80c2cc 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 17/87] Add support for UEFI operating systems returned by
+Subject: [PATCH 17/90] Add support for UEFI operating systems returned by
  os-prober
 
 os-prober returns UEFI operating systems in the form:
@@ -46,5 +46,5 @@ index 515a68c..9b8f596 100644
    esac
  done
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 0e433858169473aa7a042c28dd6f0d4e1adab8d7 Mon Sep 17 00:00:00 2001
 From: Mark Hamzy <hamzy@us.ibm.com>
 Date: Wed, 28 Mar 2012 14:46:41 -0500
-Subject: [PATCH 18/87] Migrate PPC from Yaboot to Grub2
+Subject: [PATCH 18/90] 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.
@@ -150,5 +150,5 @@ index 0000000..10d6658
 +  terminfo -g ${X}x${Y} ${TERMINAL}
 +EOF
 -- 
-2.7.4
+2.9.3
 

0019-Add-fw_path-variable-revised.patch

@@ -1,7 +1,7 @@
 From fdc52554d998170f56ed45856082f4a3bfeb3e2a Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Wed, 19 Sep 2012 21:22:55 -0300
-Subject: [PATCH 19/87] Add fw_path variable (revised)
+Subject: [PATCH 19/90] Add fw_path variable (revised)
 
 This patch makes grub look for its config file on efi where the app was
 found. It was originally written by Matthew Garrett, and adapted to fix the
@@ -77,5 +77,5 @@ index 249e19b..759c475 100644
        prefix = grub_env_get ("prefix");
        if (prefix)
 -- 
-2.7.4
+2.9.3
 

0020-Add-support-for-linuxefi.patch

@@ -1,7 +1,7 @@
 From a64179016df64b72cc956fd6085ca3ed1a41baac Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Tue, 10 Jul 2012 11:58:52 -0400
-Subject: [PATCH 20/87] Add support for linuxefi
+Subject: [PATCH 20/90] Add support for linuxefi
 
 ---
  grub-core/Makefile.core.def       |   8 +
@@ -478,5 +478,5 @@ index da0ca3b..fc36bda 100644
  
  /* Boot parameters for Linux based on 2.6.12. This is used by the setup
 -- 
-2.7.4
+2.9.3
 

0021-Use-linuxefi-and-initrdefi-where-appropriate.patch

@@ -1,7 +1,7 @@
 From 5894e3bfaf055554c786b4c1a9452d4e3bb9f568 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 16 Jul 2012 18:57:11 -0400
-Subject: [PATCH 21/87] Use "linuxefi" and "initrdefi" where appropriate.
+Subject: [PATCH 21/90] Use "linuxefi" and "initrdefi" where appropriate.
 
 ---
  util/grub.d/10_linux.in | 18 ++++++++++++++++--
@@ -46,5 +46,5 @@ index cf6331f..8ccf012 100644
    sed "s/^/$submenu_indentation/" << EOF
  }
 -- 
-2.7.4
+2.9.3
 

0022-Don-t-allow-insmod-when-secure-boot-is-enabled.patch

@@ -1,7 +1,7 @@
 From 9d70f7f9a356d965ed48963e2ead12af8de97615 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Tue, 23 Oct 2012 10:40:49 -0400
-Subject: [PATCH 22/87] Don't allow insmod when secure boot is enabled.
+Subject: [PATCH 22/90] Don't allow insmod when secure boot is enabled.
 
 Hi,
 
@@ -120,5 +120,5 @@ index 9a2da0e..2245632 100644
  EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,
  					     const grub_efi_device_path_t *dp2);
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From c2a19ee447623af8765254b87ff83cbb5b8253bc Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 1 Oct 2012 13:24:37 -0400
-Subject: [PATCH 23/87] Pass "\x[[:hex:]][[:hex:]]" straight through
+Subject: [PATCH 23/90] Pass "\x[[:hex:]][[:hex:]]" straight through
  unmolested.
 
 ---
@@ -179,5 +179,5 @@ index ab78ca8..cf6cd66 100644
        case '$':
  	if (escaped)
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From c482ec700b2ba4b1fabccaa5848cccae466d3a12 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 24/87] Add %X option to printf functions.
+Subject: [PATCH 24/90] Add %X option to printf functions.
 
 ---
  grub-core/kern/misc.c | 7 +++++--
@@ -54,5 +54,5 @@ index 6bb0351..81be344 100644
  	case 'd':
  	  {
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 70a8c5e075d59ec13fdee4c3868b3862a8cd8aa4 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 25/87] Search for specific config file for netboot
+Subject: [PATCH 25/90] 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:
@@ -199,5 +199,5 @@ index 96aa9fa..e13ae1e 100644
 +
  #endif /* ! GRUB_NET_HEADER */
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 8992c2812e1e914e803429314b9164a19af4398b 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 26/87] blscfg: add blscfg module to parse Boot Loader
+Subject: [PATCH 26/90] blscfg: add blscfg module to parse Boot Loader
  Specification snippets
 
 http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec
@@ -247,5 +247,5 @@ index 0000000..4274aca
 +  grub_unregister_extcmd (cmd);
 +}
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 3e83ff704af9a967fa55d60cc3917bc4ccd85f32 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 27/87] Don't write messages to the screen
+Subject: [PATCH 27/90] 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
@@ -177,5 +177,5 @@ index 8ccf012..a3d9711 100644
  EOF
      fi
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 9bd3d2fb49a6b8e3807ce7275876fd4b416545c9 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 28/87] Don't print GNU GRUB header
+Subject: [PATCH 28/90] Don't print GNU GRUB header
 
 No one cares.
 ---
@@ -41,5 +41,5 @@ index b2654ef..f57b750 100644
  
  static void
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From dd2c80ddd0e5e57b33a9d06894225e629b1b8b5e 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 29/87] Don't add '*' to highlighted row
+Subject: [PATCH 29/90] Don't add '*' to highlighted row
 
 It is already highlighted.
 ---
@@ -22,5 +22,5 @@ index e22bb91..a3d1f23 100644
    grub_print_ucs4_menu (unicode_title,
  			unicode_title + len,
 -- 
-2.7.4
+2.9.3
 

0030-Message-string-cleanups.patch

@@ -1,7 +1,7 @@
 From 4cc90ad7d495b896e0b6b2677285ced8ce70cee1 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 30/87] Message string cleanups
+Subject: [PATCH 30/90] Message string cleanups
 
 Make use of terminology consistent. Remove jargon.
 ---
@@ -67,5 +67,5 @@ index a3d1f23..64a8386 100644
      {
        grub_print_error ();
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From ee01481e906071d01649b61925eaac0348f9a9a7 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 31/87] Fix border spacing now that we aren't displaying it
+Subject: [PATCH 31/90] Fix border spacing now that we aren't displaying it
 
 ---
  grub-core/normal/menu_text.c | 6 +++---
@@ -28,5 +28,5 @@ index 64a8386..1062d64 100644
    geo->timeout_lines = 2;
  
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 748c629f47f4191c66011646e010cdf5ab506b90 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 32/87] Use the correct indentation for the term help text
+Subject: [PATCH 32/90] Use the correct indentation for the term help text
 
 That is consistent with the menu help text
 ---
@@ -24,5 +24,5 @@ index f57b750..0ce59fd 100644
        grub_print_message_indented (msg_formatted, 0, 0, term);
      grub_putcode ('\n', term);
 -- 
-2.7.4
+2.9.3
 

0033-Indent-menu-entries.patch

@@ -1,7 +1,7 @@
 From 93092c8a33db0cb36392c9684a60c12fbc823554 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 33/87] Indent menu entries
+Subject: [PATCH 33/90] Indent menu entries
 
 ---
  grub-core/normal/menu_text.c | 3 ++-
@@ -22,5 +22,5 @@ index 1062d64..ecc60f9 100644
    grub_print_ucs4_menu (unicode_title,
  			unicode_title + len,
 -- 
-2.7.4
+2.9.3
 

0034-Fix-margins.patch

@@ -1,7 +1,7 @@
 From ee7064d8667cf51d12f2cc5ead9b428446c563ad 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 34/87] Fix margins
+Subject: [PATCH 34/90] Fix margins
 
 ---
  grub-core/normal/menu_text.c | 8 +++-----
@@ -33,5 +33,5 @@ index ecc60f9..0e43f2c 100644
      - geo->timeout_lines /* timeout */
      - 1 /* empty final line  */;
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 712f456d542ec913c4a5bc13f86443f79912cbf3 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 21 Jun 2013 14:44:08 -0400
-Subject: [PATCH 35/87] Use -2 instead of -1 for our right-hand margin, so
+Subject: [PATCH 35/90] Use -2 instead of -1 for our right-hand margin, so
  linewrapping works (#976643).
 
 Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
@@ -23,5 +23,5 @@ index 0e43f2c..537d4bf 100644
    geo->first_entry_y = 3; /* three empty lines*/
  
 -- 
-2.7.4
+2.9.3
 

0036-Use-linux16-when-appropriate-880840.patch

@@ -1,7 +1,7 @@
 From aedb9655a10717fe3678a9e2fc720b55f5b0ffbc Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:05:07 -0400
-Subject: [PATCH 36/87] Use linux16 when appropriate (#880840)
+Subject: [PATCH 36/90] Use linux16 when appropriate (#880840)
 
 The kernel group really would prefer that we use the 16 bit entry point
 on x86 bios machines.
@@ -48,5 +48,5 @@ index a3d9711..f3bf6ac 100644
      fi
    fi
 -- 
-2.7.4
+2.9.3
 

0037-Enable-pager-by-default.-985860.patch

@@ -1,7 +1,7 @@
 From 0b72348759eaec7d1d488e9788e724a2d48ce3f7 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:09:27 -0400
-Subject: [PATCH 37/87] Enable pager by default. (#985860)
+Subject: [PATCH 37/90] Enable pager by default. (#985860)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -22,5 +22,5 @@ index 93a9023..858b526 100644
    load_env
  fi
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 55d0f5f5fdecfab6c8439520491e08a0178bd5dc Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:13:27 -0400
-Subject: [PATCH 38/87] F10 doesn't work on serial, so don't tell the user to
+Subject: [PATCH 38/90] F10 doesn't work on serial, so don't tell the user to
  hit it (#987443)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -23,5 +23,5 @@ index 537d4bf..452d55b 100644
  					       STANDARD_MARGIN, STANDARD_MARGIN,
  					       term, dry_run);
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From d110064c73c1604b07cdaa3d41751074b2701142 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 14 Mar 2011 14:27:42 -0400
-Subject: [PATCH 39/87] Don't say "GNU/Linux" in generated menus.
+Subject: [PATCH 39/90] Don't say "GNU/Linux" in generated menus.
 
 ---
  util/grub.d/10_linux.in     | 4 ++--
@@ -41,5 +41,5 @@ index c48af94..25e3c41 100644
  fi
  
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From fbd9d8969c059d6e5572b1acfa42ba48bc4299e2 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 40/87] Don't draw a border around the menu
+Subject: [PATCH 40/90] Don't draw a border around the menu
 
 It looks cleaner without it.
 ---
@@ -70,5 +70,5 @@ index 452d55b..1ed2bd9 100644
    grub_term_highlight_color = old_color_highlight;
    geo->timeout_y = geo->first_entry_y + geo->num_entries
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 3aeba4760755b9b263ed4ba60dc0431352b63fe7 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 41/87] Use the standard margin for the timeout string
+Subject: [PATCH 41/90] Use the standard margin for the timeout string
 
 So that it aligns with the other messages
 ---
@@ -39,5 +39,5 @@ index 1ed2bd9..7681f7d 100644
      }
  
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 333159a74035a726841c6c888f43d983a40ed959 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Mon, 13 Jan 2014 21:50:59 -0500
-Subject: [PATCH 42/87] Add .eh_frame to list of relocations stripped
+Subject: [PATCH 42/90] Add .eh_frame to list of relocations stripped
 
 ---
  conf/Makefile.common | 2 +-
@@ -21,5 +21,5 @@ index 11296b5..a476ab5 100644
  CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding
  LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
 -- 
-2.7.4
+2.9.3
 

0043-Make-10_linux-work-with-our-changes-for-linux16-and-.patch

@@ -1,7 +1,7 @@
 From 5fa65416bae89efb88015e72cb21c28fe3833fc8 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jan 2014 13:12:23 -0500
-Subject: [PATCH 43/87] Make 10_linux work with our changes for linux16 and
+Subject: [PATCH 43/90] Make 10_linux work with our changes for linux16 and
  linuxefi on aarch64
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -81,5 +81,5 @@ index ef52cf3..191aebe 100644
    for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
      if test -e "${i}" ; then
 -- 
-2.7.4
+2.9.3
 

0044-Don-t-print-during-fdt-loading-method.patch

@@ -1,7 +1,7 @@
 From e89fd78bb3f62064d930c82ad14cd490166d1a2c Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jan 2014 16:15:46 -0500
-Subject: [PATCH 44/87] Don't print during fdt loading method.
+Subject: [PATCH 44/90] Don't print during fdt loading method.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -23,5 +23,5 @@ index 191aebe..452a9f6 100644
  EOF
    fi
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 7683e149c587abf2d35de11c39ddb0810572b2e4 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 45/87] Don't munge raw spaces when we're doing our cmdline
+Subject: [PATCH 45/90] Don't munge raw spaces when we're doing our cmdline
  escaping (#923374)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -32,5 +32,5 @@ index 0a5b2af..970ea86 100644
  	    {
  	      *buf++ = *c++;
 -- 
-2.7.4
+2.9.3
 

0046-Don-t-require-a-password-to-boot-entries-generated-b.patch

@@ -1,7 +1,7 @@
 From 8a11a21d904e7e823ee6f17faedbf45a8e28044a Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 11 Feb 2014 11:14:50 -0500
-Subject: [PATCH 46/87] Don't require a password to boot entries generated by
+Subject: [PATCH 46/90] Don't require a password to boot entries generated by
  grub-mkconfig.
 
 When we set a password, we just want that to mean you can't /edit/ an entry.
@@ -27,5 +27,5 @@ index 452a9f6..79a747e 100644
  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
    OS="$(sed 's, release .*$,,g' /etc/system-release)"
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 5468ac6eef409220e59741ccf1073d92916cdddf Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 18 Feb 2014 09:37:49 -0500
-Subject: [PATCH 47/87] Don't emit "Booting ..." message.
+Subject: [PATCH 47/90] Don't emit "Booting ..." message.
 
 UI team still hates this stuff, so we're disabling it for RHEL 7.
 
@@ -48,5 +48,5 @@ index eeeee55..8349049 100644
    errs_before = grub_err_printed_errors;
  
 -- 
-2.7.4
+2.9.3
 

0048-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch

@@ -1,7 +1,7 @@
 From cce065ff19272aa908a293632a265211201d7237 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 4 Mar 2014 11:00:23 -0500
-Subject: [PATCH 48/87] Replace a lot of man pages with slightly nicer ones.
+Subject: [PATCH 48/90] Replace a lot of man pages with slightly nicer ones.
 
 Replace a bunch of machine generated ones with ones that look nicer.
 ---
@@ -1959,5 +1959,5 @@ index 0000000..37ea2dd
 +.SH SEE ALSO
 +.BR "info grub"
 -- 
-2.7.4
+2.9.3
 

0049-use-fw_path-prefix-when-fallback-searching-for-grub-.patch

@@ -1,7 +1,7 @@
 From c28ddef07d11d790d89ee6ec8e3a8cc7e1aace0d Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Wed, 19 Feb 2014 15:58:43 -0500
-Subject: [PATCH 49/87] use fw_path prefix when fallback searching for grub
+Subject: [PATCH 49/90] use fw_path prefix when fallback searching for grub
  config
 
 When PXE booting via UEFI firmware, grub was searching for grub.cfg
@@ -41,5 +41,5 @@ index 0ce59fd..a3713ef 100644
          {
            grub_size_t config_len;
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 82812e4ade82c9aa4f2e8f091b60b714ecfd82e5 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 6 Mar 2014 11:51:33 -0500
-Subject: [PATCH 50/87] Try mac/guid/etc before grub.cfg on tftp config files.
+Subject: [PATCH 50/90] Try mac/guid/etc before grub.cfg on tftp config files.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -110,5 +110,5 @@ index a3713ef..7d9c4f0 100644
    else
      grub_enter_normal_mode (argv[0]);
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From b954efc0812579f973031b24c68a2f593bd89ba1 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 18 Feb 2014 11:34:00 -0500
-Subject: [PATCH 51/87] Fix convert function to support NVMe devices
+Subject: [PATCH 51/90] 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
@@ -55,5 +55,5 @@ index 92c0d70..bf317a2 100644
      return grub_util_devmapper_part_to_disk (&st, is_part, os_dev);
  
 -- 
-2.7.4
+2.9.3
 

0052-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch

@@ -1,7 +1,7 @@
 From 6900527741a21097f57a72854944f3e078a0ee42 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Mon, 10 Feb 2014 16:13:10 -0500
-Subject: [PATCH 52/87] Switch to use APM Mustang device tree, for hardware
+Subject: [PATCH 52/90] Switch to use APM Mustang device tree, for hardware
  testing.
 
 Signed-off-by: David A. Marlin <d.marlin@redhat.com>
@@ -25,5 +25,5 @@ index 79a747e..462b461 100644
      fi
    done
 -- 
-2.7.4
+2.9.3
 

0053-Use-the-default-device-tree-from-the-grub-default-fi.patch

@@ -1,7 +1,7 @@
 From 823290f622902f1ae06efa29efbe4ca15af1aafe Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Wed, 12 Feb 2014 14:54:04 -0500
-Subject: [PATCH 53/87] Use the default device tree from the grub default file
+Subject: [PATCH 53/90] Use the default device tree from the grub default file
 
 instead of hardcoding a value.
 
@@ -41,5 +41,5 @@ index 462b461..a9692a0 100644
      fi
    done
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From e119353dad1eadc771a011f82bf90bd04fc00f9a 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 54/87] reopen SNP protocol for exclusive use by grub
+Subject: [PATCH 54/90] reopen SNP protocol for exclusive use by grub
 
 ---
  grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++
@@ -42,5 +42,5 @@ index 5388f95..ea0e0ca 100644
    }
  }
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 5d47b56198754190c62179ae10ef175c00d1474d Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 4 Mar 2016 15:13:59 -0500
-Subject: [PATCH 55/87] Revert "reopen SNP protocol for exclusive use by grub"
+Subject: [PATCH 55/90] Revert "reopen SNP protocol for exclusive use by grub"
 
 This reverts commit a3f2c756ce34c9666bddef35e3b3b85ccecdcffc , which is
 obsoleted by these:
@@ -50,5 +50,5 @@ index ea0e0ca..5388f95 100644
    }
  }
 -- 
-2.7.4
+2.9.3
 

0056-Add-grub_util_readlink.patch

@@ -1,7 +1,7 @@
 From 5a69c7fbfff14bcea80e781fcd6acad07c904e22 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Sep 2014 10:01:03 -0400
-Subject: [PATCH 56/87] Add grub_util_readlink()
+Subject: [PATCH 56/90] Add grub_util_readlink()
 
 Add grub_util_readlink().  This requires pulling in stat and readlink from
 gnulib, which pulls in stat and related headers, but after that the
@@ -3730,5 +3730,5 @@ index 0000000..9852778
 +  REPLACE_LOCALTIME=0;                   AC_SUBST([REPLACE_LOCALTIME])
 +])
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From a867dc42c711385634d86f04176cf3193d548f1d Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Sep 2014 10:38:00 -0400
-Subject: [PATCH 57/87] Make editenv chase symlinks including those across
+Subject: [PATCH 57/90] Make editenv chase symlinks including those across
  devices.
 
 This lets us make /boot/grub2/grubenv a symlink to
@@ -102,5 +102,5 @@ index c6f8d22..d8d1dad 100644
 +  free (rename_target);
  }
 -- 
-2.7.4
+2.9.3
 

0058-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch

@@ -1,7 +1,7 @@
 From 14b8db374bfc41fffa278ec33084324008384417 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 14:23:23 -0400
-Subject: [PATCH 58/87] Generate OS and CLASS in 10_linux from /etc/os-release
+Subject: [PATCH 58/90] Generate OS and CLASS in 10_linux from /etc/os-release
 
 This makes us use pretty names in the titles we generate in
 grub2-mkconfig when GRUB_DISTRIBUTOR isn't set.
@@ -28,5 +28,5 @@ index a9692a0..c662726 100644
    OS="${GRUB_DISTRIBUTOR}"
    CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
 -- 
-2.7.4
+2.9.3
 

0059-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch

@@ -1,7 +1,7 @@
 From 700c631b4c887778951503346afe5b7ee70bf7dd Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 15:52:08 -0400
-Subject: [PATCH 59/87] Minimize the sort ordering for .debug and -rescue-
+Subject: [PATCH 59/90] Minimize the sort ordering for .debug and -rescue-
  kernels.
 
 Resolves: rhbz#1065360
@@ -30,5 +30,5 @@ index cf35e41..10fabee 100644
    version_test_numeric "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b"
    return "$?"
 -- 
-2.7.4
+2.9.3
 

0060-Load-arm-with-SB-enabled.patch

@@ -1,7 +1,7 @@
 From cae0d2cdb28017df75358e0839c60a9c2521cb82 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 18 Sep 2014 11:26:14 -0400
-Subject: [PATCH 60/87] Load arm with SB enabled.
+Subject: [PATCH 60/90] Load arm with SB enabled.
 
 Make sure we actually try to validate secure boot on this platform (even
 though we're not shipping it enabled by default.)
@@ -424,5 +424,5 @@ index 0000000..d9ede36
 +
 +#endif /* ! GRUB_EFI_LINUX_HEADER */
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From d255a98813193eb2c23f9217106b121278843023 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 3 Oct 2014 11:08:03 -0400
-Subject: [PATCH 61/87] Try $prefix if $fw_path doesn't work.
+Subject: [PATCH 61/90] Try $prefix if $fw_path doesn't work.
 
 Related: rhbz#1148652
 
@@ -207,5 +207,5 @@ index 7d9c4f0..b69f9e7 100644
  }
  
 -- 
-2.7.4
+2.9.3
 

0062-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch

@@ -1,7 +1,7 @@
 From 8e6fc0ea14aa01817cc9103ffd5e328a78e56857 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 27 Oct 2014 09:22:55 -0400
-Subject: [PATCH 62/87] Try to emit linux16/initrd16 and linuxefi/initrdefi in
+Subject: [PATCH 62/90] Try to emit linux16/initrd16 and linuxefi/initrdefi in
  30-os_prober.
 
 Resolves: rhbz#1108296
@@ -73,5 +73,5 @@ index 9b8f596..dc98eac 100644
          fi
          cat << EOF
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From b6e3ffe7ae7e4222cc15876cb72c691112f3c4b0 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 28 Apr 2015 11:15:03 -0400
-Subject: [PATCH 63/87] Make grub2-mkconfig construct titles that look like the
+Subject: [PATCH 63/90] Make grub2-mkconfig construct titles that look like the
  ones we want elsewhere.
 
 Resolves: rhbz#1215839
@@ -50,5 +50,5 @@ index c662726..1215241 100644
        echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
    else
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From c4be6106eae8c1b479c325f531a1f81188f400e8 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Mon, 16 Mar 2015 16:34:51 -0400
-Subject: [PATCH 64/87] Update info with grub.cfg netboot selection order
+Subject: [PATCH 64/90] Update info with grub.cfg netboot selection order
  (#1148650)
 
 Added documentation to the grub info page that specifies the order
@@ -66,5 +66,5 @@ index 98d4d0d..4c6323b 100644
  @samp{(tftp)} device.
  
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 11abe391636d0819902357591aebf0ea01b88130 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Mon, 16 Mar 2015 14:14:19 -0400
-Subject: [PATCH 65/87] Use Distribution Package Sort for grub2-mkconfig
+Subject: [PATCH 65/90] Use Distribution Package Sort for grub2-mkconfig
  (#1124074)
 
 Users reported that newly installed kernels on their systems installed
@@ -456,5 +456,5 @@ index 0000000..f33bd1e
 +  return 0;
 +}
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From f7574b40f89ded29d82e5cfdb7494f8884bc1cdb Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Thu, 25 Jun 2015 11:13:11 -0400
-Subject: [PATCH 66/87] Add friendly grub2 password config tool (#985962)
+Subject: [PATCH 66/90] Add friendly grub2 password config tool (#985962)
 
 Provided a tool for users to reset the grub2 root user password
 without having to alter the grub.cfg. The hashed password now
@@ -270,5 +270,5 @@ index 0000000..db2f44b
 +fi
 +EOF
 -- 
-2.7.4
+2.9.3
 

0067-Fix-race-in-EFI-validation.patch

@@ -1,7 +1,7 @@
 From a605e7af01dc697021b96fe6fbaf92ef3fca017c Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Tue, 14 Jul 2015 16:58:51 -0700
-Subject: [PATCH 67/87] Fix race in EFI validation
+Subject: [PATCH 67/90] Fix race in EFI validation
 
 ---
  grub-core/loader/i386/efi/linux.c | 44 ++++++++++-----------------------------
@@ -93,5 +93,5 @@ index e5b7785..7ccf32d 100644
      {
        grub_dl_unref (my_mod);
 -- 
-2.7.4
+2.9.3
 

0068-ppc64le-sync-mkconfig-to-disk-1212114.patch

@@ -1,7 +1,7 @@
 From 63efe6a207f59ffa9e55cc10a0aed272f3571227 Mon Sep 17 00:00:00 2001
 From: Don Zickus <dzickus@redhat.com>
 Date: Wed, 22 Jul 2015 13:59:55 -0400
-Subject: [PATCH 68/87] ppc64le sync mkconfig to disk (#1212114)
+Subject: [PATCH 68/90] ppc64le sync mkconfig to disk (#1212114)
 
 If creating a new grub2 entry using grub2-mkconfig, the entry is not
 immediately sync'd to disk.  If a crash happens before the writeback,
@@ -38,5 +38,5 @@ index fb87247..73a18f7 100644
 +    sync && mountpoint -q /boot &&fsfreeze -f /boot && fsfreeze -u /boot
 +fi
 -- 
-2.7.4
+2.9.3
 

0069-Use-device-part-of-chainloader-target-if-present.patch

@@ -1,7 +1,7 @@
 From 9d47b2c482b6db238c99fe106f4b2e3c612f3a91 Mon Sep 17 00:00:00 2001
 From: Raymund Will <rw@suse.com>
 Date: Fri, 10 Apr 2015 01:45:02 -0400
-Subject: [PATCH 69/87] Use device part of chainloader target, if present.
+Subject: [PATCH 69/90] Use device part of chainloader target, if present.
 
 Otherwise chainloading is restricted to '$root', which might not even
 be readable by EFI!
@@ -33,5 +33,5 @@ index 522a716..6b47497 100644
      goto fail;
  
 -- 
-2.7.4
+2.9.3
 

0070-Add-secureboot-support-on-efi-chainloader.patch

@@ -1,7 +1,7 @@
 From 9cbf35d19f4ffafdf2683acf7b6a320b55bbdfca Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 6 Oct 2015 13:04:37 -0400
-Subject: [PATCH 70/87] Add secureboot support on efi chainloader
+Subject: [PATCH 70/90] Add secureboot support on efi chainloader
 
 Expand the chainloader to be able to verify the image by means of shim
 lock protocol. The PE/COFF image is loaded and relocated by the
@@ -796,5 +796,5 @@ index f79c36c..f79782e 100644
  {
    grub_uint32_t page_rva;
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From c1d31b6a26e5542142d569c94a70f1dc8e07afd6 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 6 Oct 2015 16:09:25 -0400
-Subject: [PATCH 71/87] Make any of the loaders that link in efi mode honor
+Subject: [PATCH 71/90] 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
@@ -490,5 +490,5 @@ diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h
 new file mode 100644
 index 0000000..e69de29
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 5a0d703884a73f93a68753c6ed64bdf08797c82a 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 72/87] Fix security issue when reading username and password
+Subject: [PATCH 72/90] Fix security issue when reading username and password
 
   This patch fixes two integer underflows at:
     * grub-core/lib/crypto.c
@@ -43,5 +43,5 @@ index 7338f82..6d6dc7d 100644
  	  if (cur_len)
  	    {
 -- 
-2.7.4
+2.9.3
 

0073-Make-grub_fatal-also-backtrace.patch

@@ -1,7 +1,7 @@
 From c37a4f02e5fd0c3aa5f54baaeaf32eed0e3c110b Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 27 Jan 2016 09:22:42 -0500
-Subject: [PATCH 73/87] Make grub_fatal() also backtrace.
+Subject: [PATCH 73/90] Make grub_fatal() also backtrace.
 
 ---
  grub-core/Makefile.core.def     |  3 ++
@@ -171,5 +171,5 @@ index c3e03c7..c67273d 100644
  #include <grub/term.h>
  #include <grub/backtrace.h>
 -- 
-2.7.4
+2.9.3
 

0074-Rework-linux-command.patch

@@ -1,7 +1,7 @@
 From 33d11870bbc2fa554fa9344c3c180279c258736a Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:12:39 -0700
-Subject: [PATCH 74/87] Rework linux command
+Subject: [PATCH 74/90] 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
@@ -103,5 +103,5 @@ index b0afcca..5eb7d17 100644
      grub_file_close (file);
  
 -- 
-2.7.4
+2.9.3
 

0075-Rework-linux16-command.patch

@@ -1,7 +1,7 @@
 From 0b86b309de12b4f3ea920124faa60841ffedf472 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:20:58 -0700
-Subject: [PATCH 75/87] Rework linux16 command
+Subject: [PATCH 75/90] 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
@@ -97,5 +97,5 @@ index 9128315..b864e54 100644
      grub_file_close (file);
  
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From edaa6c877917816d57603e26d660107c82ffbb5d Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 4 Mar 2016 16:29:13 -0500
-Subject: [PATCH 76/87] Make grub-editenv build again.
+Subject: [PATCH 76/90] Make grub-editenv build again.
 
 36212460d3565b18439a3a8130b28e6c97702c6a split how some of the mkimage
 utility functions are defined, and they wind up being linked into
@@ -26,5 +26,5 @@ index 226c46b..8007de9 100644
    common = util/config.c;
    common = util/resolve.c;
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From d2f552900d87b62ca0dbc740902d561bc32f32be Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Fri, 29 Jan 2016 17:34:02 -0500
-Subject: [PATCH 77/87] Fix locale issue in grub-setpassword (#1294243)
+Subject: [PATCH 77/90] 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
@@ -26,5 +26,5 @@ index dd76f00..2923f43 100644
          sed -e "s/PBKDF2 hash of your password is //"
  }
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From 216188f920d3ade19626d6e8fe450cea2c427e53 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 23 Sep 2014 09:58:49 -0400
-Subject: [PATCH 78/87] Fix up some man pages rpmdiff noticed.
+Subject: [PATCH 78/90] Fix up some man pages rpmdiff noticed.
 
 ---
  configure.ac             |  2 ++
@@ -149,5 +149,5 @@ index 0000000..8530948
 +.SH SEE ALSO
 +.BR "info grub"
 -- 
-2.7.4
+2.9.3
 

0079-Handle-rssd-storage-devices.patch

@@ -1,7 +1,7 @@
 From 90e2d3fbb161d494cdfc0ad0da740a6a4f651d70 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 30 Jun 2015 15:50:41 -0400
-Subject: [PATCH 79/87] Handle rssd storage devices.
+Subject: [PATCH 79/90] Handle rssd storage devices.
 
 Resolves: rhbz#1087962
 
@@ -35,5 +35,5 @@ index 09e7e6e..ad7b774 100644
        if ((strncmp ("loop", p, 4) == 0) && p[4] >= '0' && p[4] <= '9')
  	{
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From f46e9b0378cfaced22f0de5e8061ddb0c6829ee8 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Mon, 22 Feb 2016 15:30:05 -0500
-Subject: [PATCH 80/87] Warn if grub password will not be read (#1290803)
+Subject: [PATCH 80/90] 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
@@ -27,5 +27,5 @@ index 2923f43..dd7b793 100644
 +    echo "Update your configuration with @grub_mkconfig@ to support this feature."
 +fi
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From f41adcd85164ef8a0d0918f0508f29dcf3c7467d Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Tue, 26 Jan 2016 10:28:35 -0500
-Subject: [PATCH 81/87] Clean up grub-setpassword documentation (#1290799)
+Subject: [PATCH 81/90] 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
@@ -54,5 +54,5 @@ index dd7b793..d7924af 100644
  Report bugs at https://bugzilla.redhat.com.
  EOF
 -- 
-2.7.4
+2.9.3
 

0082-Re-work-some-intricacies-of-PE-loading.patch

@@ -1,7 +1,7 @@
 From e2b22111a8ec58091603fc785f54b1b998888735 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 9 Jun 2016 12:22:29 -0400
-Subject: [PATCH 82/87] Re-work some intricacies of PE loading.
+Subject: [PATCH 82/90] Re-work some intricacies of PE loading.
 
 The PE spec is not a well written document, and awesomely every place
 where there's an ambiguous way to read something, Windows' bootmgfw.efi
@@ -349,5 +349,5 @@ index f79782e..8396bde 100644
  
  struct grub_pe32_header
 -- 
-2.7.4
+2.9.3
 

0083-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch

@@ -1,7 +1,7 @@
 From 8b4deb97529ba7ff689a11639f2a5bfdb29ad2ea Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 10 Jun 2016 14:06:15 -0400
-Subject: [PATCH 83/87] Rework even more of efi chainload so non-sb cases work
+Subject: [PATCH 83/90] Rework even more of efi chainload so non-sb cases work
  right.
 
 This ensures that if shim protocol is not loaded, or is loaded but shim
@@ -382,5 +382,5 @@ index d9ede36..0033d93 100644
  grub_err_t
  EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset,
 -- 
-2.7.4
+2.9.3
 

0084-linuxefi-fix-double-free-on-verification-failure.patch

@@ -1,7 +1,7 @@
 From 0a3a4d0b69b5d68f3e4b6b74fe2e6b5d4dcace4f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jun 2016 09:50:25 -0400
-Subject: [PATCH 84/87] linuxefi: fix double free on verification failure.
+Subject: [PATCH 84/90] linuxefi: fix double free on verification failure.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -21,5 +21,5 @@ index 82f75b7..010bf98 100644
      }
  
 -- 
-2.7.4
+2.9.3
 

0085-fix-machine-type-test-in-30_os-prober.in.patch

@@ -1,7 +1,7 @@
 From be4d338b0c086e9cbbd2d353cd88abad67c000c9 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 11 Jul 2016 13:36:45 -0400
-Subject: [PATCH 85/87] fix machine type test in 30_os-prober.in
+Subject: [PATCH 85/90] fix machine type test in 30_os-prober.in
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -21,5 +21,5 @@ index dc98eac..e40274f 100644
      i?86|x86_64)
        sixteenbit="16"
 -- 
-2.7.4
+2.9.3
 

0086-ppc64le-has-no-separate-boot-mount-1261926.patch

@@ -1,7 +1,7 @@
 From 12a2215a6f13f2503a9e38d84fff64789c6a34b7 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Fri, 17 Jun 2016 11:47:34 -0400
-Subject: [PATCH 86/87] ppc64le has no separate /boot mount (#1261926)
+Subject: [PATCH 86/90] ppc64le has no separate /boot mount (#1261926)
 
 The patch for rhbz#1212114 ensures that ppc64le systems sync grub config
 changes to disk prior to grub-mkconfig completion and a reboot.
@@ -40,5 +40,5 @@ index 73a18f7..fb87247 100644
 -    sync && mountpoint -q /boot &&fsfreeze -f /boot && fsfreeze -u /boot
 -fi
 -- 
-2.7.4
+2.9.3
 

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

@@ -1,7 +1,7 @@
 From d3d42740661dce4df12330e57a1681a3b296622e Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 23 Jun 2016 11:01:39 -0400
-Subject: [PATCH 87/87] Add grub-get-kernel-settings and use it in 10_linux
+Subject: [PATCH 87/90] Add grub-get-kernel-settings and use it in 10_linux
 
 This patch adds grub-get-kernel-settings, which reads the system kernel
 installation configuration from /etc/sysconfig/kernel, and outputs
@@ -298,5 +298,5 @@ index 1215241..0c5b227 100644
    fi
  
 -- 
-2.7.4
+2.9.3
 

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

@@ -0,0 +1,58 @@
+From 22d26153c1d92b8a42d1ec823b7f7c77c1cc0a8c Mon Sep 17 00:00:00 2001
+From: Lenny Szubowicz <lszubowi@redhat.com>
+Date: Mon, 29 Aug 2016 11:04:48 -0400
+Subject: [PATCH 88/90] 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 7d90bf6..63bbc28 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;
+ 
+-- 
+2.9.3
+

0089-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch

@@ -0,0 +1,39 @@
+From 7b7b0c5501fb98efddf946ba877901ad339fab90 Mon Sep 17 00:00:00 2001
+From: Laszlo Ersek <lersek@redhat.com>
+Date: Mon, 21 Nov 2016 15:34:00 +0100
+Subject: [PATCH 89/90] efi/chainloader: fix wrong sanity check in
+ relocate_coff()
+
+In relocate_coff(), the relocation entries are parsed from the original
+image (not the section-wise copied image). The original image is
+pointed-to by the "orig" pointer. The current check
+
+  (void *)reloc_end < data
+
+compares the addresses of independent memory allocations. "data" is a typo
+here, it should be "orig".
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1347291
+Signed-off-by: Laszlo Ersek <lersek@redhat.com>
+Tested-by: Bogdan Costescu <bcostescu@gmail.com>
+Tested-by: Juan Orti <j.orti.alcaine@gmail.com>
+---
+ grub-core/loader/efi/chainloader.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
+index 49a7662..1bd7ffb 100644
+--- a/grub-core/loader/efi/chainloader.c
++++ b/grub-core/loader/efi/chainloader.c
+@@ -397,7 +397,7 @@ relocate_coff (pe_coff_loader_image_context_t *context,
+       reloc_end = (struct grub_pe32_fixup_block *)
+ 	((char *)reloc_base + reloc_base->size);
+ 
+-      if ((void *)reloc_end < data || (void *)reloc_end > image_end)
++      if ((void *)reloc_end < orig || (void *)reloc_end > image_end)
+         {
+           grub_error (GRUB_ERR_BAD_ARGUMENT, "Reloc entry %d overflows binary",
+ 		      n);
+-- 
+2.9.3
+

0090-efi-chainloader-truncate-overlong-relocation-section.patch

@@ -0,0 +1,113 @@
+From 113c2d03409881e818322db4279fcdbfdf4ef0d8 Mon Sep 17 00:00:00 2001
+From: Laszlo Ersek <lersek@redhat.com>
+Date: Wed, 23 Nov 2016 06:27:09 +0100
+Subject: [PATCH 90/90] efi/chainloader: truncate overlong relocation section
+
+The UEFI Windows 7 boot loader ("EFI/Microsoft/Boot/bootmgfw.efi", SHA1
+31b410e029bba87d2068c65a80b88882f9f8ea25) has inconsistent headers.
+
+Compare:
+
+> The Data Directory
+> ...
+> Entry 5 00000000000d9000 00000574 Base Relocation Directory [.reloc]
+
+Versus:
+
+> Sections:
+> Idx Name      Size      VMA               LMA               File off ...
+> ...
+>  10 .reloc    00000e22  00000000100d9000  00000000100d9000  000a1800 ...
+
+That is, the size reported by the RelocDir entry (0x574) is smaller than
+the virtual size of the .reloc section (0xe22).
+
+Quoting the grub2 debug log for the same:
+
+> chainloader.c:595: reloc_dir: 0xd9000 reloc_size: 0x00000574
+> chainloader.c:603: reloc_base: 0x7d208000 reloc_base_end: 0x7d208573
+> ...
+> chainloader.c:620: Section 10 ".reloc" at 0x7d208000..0x7d208e21
+> chainloader.c:661:  section is not reloc section?
+> chainloader.c:663:  rds: 0x00001000, vs: 00000e22
+> chainloader.c:664:  base: 0x7d208000 end: 0x7d208e21
+> chainloader.c:666:  reloc_base: 0x7d208000 reloc_base_end: 0x7d208573
+> chainloader.c:671:  Section characteristics are 42000040
+> chainloader.c:673:  Section virtual size: 00000e22
+> chainloader.c:675:  Section raw_data size: 00001000
+> chainloader.c:678:  Discarding section
+
+After hexdumping "bootmgfw.efi" and manually walking its relocation blocks
+(yes, really), I determined that the (smaller) RelocDir value is correct.
+The remaining area that extends up to the .reloc section size (== 0xe22 -
+0x574 == 0x8ae bytes) exists as zero padding in the file.
+
+This zero padding shouldn't be passed to relocate_coff() for parsing. In
+order to cope with it, split the handling of .reloc sections into the
+following branches:
+
+- original case (equal size): original behavior (--> relocation
+  attempted),
+
+- overlong .reloc section (longer than reported by RelocDir): truncate the
+  section to the RelocDir size for the purposes of relocate_coff(), and
+  attempt relocation,
+
+- .reloc section is too short, or other checks fail: original behavior
+  (--> relocation not attempted).
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1347291
+Signed-off-by: Laszlo Ersek <lersek@redhat.com>
+---
+ grub-core/loader/efi/chainloader.c | 26 +++++++++++++++++++++-----
+ 1 file changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
+index 1bd7ffb..70c95ee 100644
+--- a/grub-core/loader/efi/chainloader.c
++++ b/grub-core/loader/efi/chainloader.c
+@@ -592,7 +592,7 @@ handle_image (void *data, grub_efi_uint32_t datasize)
+   grub_dprintf ("chain", "reloc_base: %p reloc_base_end: %p\n",
+ 		reloc_base, reloc_base_end);
+ 
+-  struct grub_pe32_section_table *reloc_section = NULL;
++  struct grub_pe32_section_table *reloc_section = NULL, fake_reloc_section;
+ 
+   section = context.first_section;
+   for (i = 0; i < context.number_of_sections; i++, section++)
+@@ -641,12 +641,28 @@ handle_image (void *data, grub_efi_uint32_t datasize)
+ 	   * made sense, and the VA and size match RelocDir's
+ 	   * versions, then we believe in this section table. */
+ 	  if (section->raw_data_size && section->virtual_size &&
+-	      base && end && reloc_base == base && reloc_base_end == end)
++	      base && end && reloc_base == base)
+ 	    {
+-	      grub_dprintf ("chain", " section is relocation section\n");
+-	      reloc_section = section;
++	      if (reloc_base_end == end)
++		{
++		  grub_dprintf ("chain", " section is relocation section\n");
++		  reloc_section = section;
++		}
++	      else if (reloc_base_end && reloc_base_end < end)
++	        {
++		  /* Bogus virtual size in the reloc section -- RelocDir
++		   * reported a smaller Base Relocation Directory. Decrease
++		   * the section's virtual size so that it equal RelocDir's
++		   * idea, but only for the purposes of relocate_coff(). */
++		  grub_dprintf ("chain",
++				" section is (overlong) relocation section\n");
++		  grub_memcpy (&fake_reloc_section, section, sizeof *section);
++		  fake_reloc_section.virtual_size -= (end - reloc_base_end);
++		  reloc_section = &fake_reloc_section;
++		}
+ 	    }
+-	  else
++
++	  if (!reloc_section)
+ 	    {
+ 	      grub_dprintf ("chain", " section is not reloc section?\n");
+ 	      grub_dprintf ("chain", " rds: 0x%08x, vs: %08x\n",
+-- 
+2.9.3
+

do-rebase

@@ -15,7 +15,7 @@ usage()
 	exit $retcode
 }
 
-if ! git status | grep -q 'nothing to commit, working directory clean' ; then
+if ! git status | grep -q 'nothing to commit, working .* clean' ; then
 	echo "Working directory is not clean, cannot rebase." 1>&2
 	exit 1
 fi

grub.patches

@@ -86,3 +86,9 @@ Patch0084: 0084-linuxefi-fix-double-free-on-verification-failure.patch
 Patch0085: 0085-fix-machine-type-test-in-30_os-prober.in.patch
 Patch0086: 0086-ppc64le-has-no-separate-boot-mount-1261926.patch
 Patch0087: 0087-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
+Patch0088: 0088-Normalize-slashes-in-tftp-paths.patch
+Patch0089: 0089-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch
+Patch0090: 0090-efi-chainloader-truncate-overlong-relocation-section.patch
+Patch0091: 0001-blscfg-make-the-bls_import-command-know-to-search-en.patch
+Patch0092: 0002-Make-grub2-mkconfig-able-to-output-BLS-based-config-.patch
+Patch0093: 0001-Make-blscfg-include-some-IDs-and-indices.patch

grub2.spec

@@ -45,7 +45,7 @@
 Name:           grub2
 Epoch:          1
 Version:        2.02
-Release:        0.34%{?dist}
+Release:        0.38%{?dist}.bls3
 Summary:        Bootloader with support for Linux, Multiboot and more
 
 Group:          System Environment/Base
@@ -225,7 +225,7 @@ cd grub-efi-%{tarversion}
 	--disable-werror
 make %{?_smp_mflags}
 
-GRUB_MODULES="	all_video boot btrfs cat chain configfile echo \
+GRUB_MODULES="	all_video boot blscfg btrfs cat chain configfile echo \
 		efifwsetup efinet ext2 fat font gfxmenu gfxterm gzio halt \
 		hfsplus iso9660 jpeg loadenv loopback lvm mdraid09 mdraid1x \
 		minicmd normal part_apple part_msdos part_gpt \
@@ -273,7 +273,7 @@ cd grub-%{tarversion}
 		-e 's/-fexceptions//g'				\
 		-e 's/-m64//g'					\
 		-e 's/-fasynchronous-unwind-tables//g'		\
-		-e 's/-mcpu=power7/-mcpu=power6/g'		\
+		-e 's/-mcpu=power[[:alnum:]]\+/-mcpu=power6/g'	\
 		-e 's/^/ -fno-strict-aliasing /' )"		\
 	TARGET_LDFLAGS=-static					\
         --with-platform=%{platform}				\
@@ -342,6 +342,9 @@ mkdir ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 ln -sf %{_sysconfdir}/default/grub \
 	${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/grub
 
+./grub-editenv ${RPM_BUILD_ROOT}/boot/efi/EFI/%{efidir}/grubenv create
+truncate -s 512 ${RPM_BUILD_ROOT}/boot/efi/EFI/%{efidir}/grubenv
+
 cd ..
 %find_lang grub
 
@@ -364,9 +367,10 @@ cat << EOF > ${RPM_BUILD_ROOT}%{_sysconfdir}/prelink.conf.d/grub2.conf
 -b /usr/sbin/grub2-sparc64-setup
 EOF
 
-%ifarch %{efiarchs}
 mkdir -p boot/efi/EFI/%{efidir}/
 ln -s /boot/efi/EFI/%{efidir}/grubenv boot/grub2/grubenv
+%ifarch %{efiarchs}
+mkdir -p boot/efi/EFI/%{efidir}/loader/entries/
 %endif
 
 # Don't run debuginfo on all the grub modules and whatnot; it just
@@ -467,6 +471,7 @@ fi
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}-efi.cfg
 %attr(0755,root,root)/boot/efi/EFI/%{efidir}
+%attr(0755,root,root)/boot/efi/EFI/%{efidir}/loader/entries/
 %attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts
 %ghost %config(noreplace) /boot/efi/EFI/%{efidir}/grub.cfg
 %doc grub-%{tarversion}/COPYING
@@ -545,6 +550,21 @@ fi
 %{_datarootdir}/grub/themes/starfield
 
 %changelog
+* Thu Dec 08 2016 Peter Jones <pjones@redhat.com> - 2.02-0.38
+- Fix regexp in power compile flags, and synchronize release number with
+  other branches.
+
+* Fri Dec 02 2016 pjones <pjones@redhat.com> - 1:2.02-0.37
+- Rebased to newer upstream for fedora-25
+
+* Thu Dec 01 2016 Peter Jones <pjones@redhat.com> - 2.02-0.36
+- Rebased to newer upstream for fedora-25
+
+* Thu Dec 01 2016 Peter Jones <pjones@redhat.com> - 2.02-0.34
+- Fix power6 makefile bits for newer autoconf defaults.
+- efi/chainloader: fix wrong sanity check in relocate_coff() (Laszlo Ersek)
+  Resolves: rhbz#1347291
+
 * Thu Aug 25 2016 Peter Jones <pjones@redhat.com> - 2.02-0.34
 - Update to be newer than f24's branch.
 - Add grub2-get-kernel-settings