Update to 2.06 final release and ton of fixes

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

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

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

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

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Fri, 12 Mar 2021 23:25:01 +0100
+Date: Fri, 11 Jun 2021 12:10:54 +0200
 Subject: [PATCH] Revert "templates: Properly disable the os-prober by default"
 
 This reverts commit 54e0a1bbf1e9106901a557195bb35e5e20fb3925.
@@ -10,10 +10,10 @@ This reverts commit 54e0a1bbf1e9106901a557195bb35e5e20fb3925.
  2 files changed, 5 insertions(+), 8 deletions(-)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 1a70b7ea056..f55339a3f64 100644
+index f8cbb8d7a2b..d3e879b8e5c 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -147,9 +147,6 @@ GRUB_DEVICE_PARTUUID="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2
+@@ -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
  
@@ -23,7 +23,7 @@ index 1a70b7ea056..f55339a3f64 100644
  # 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`"
-@@ -213,7 +210,6 @@ export GRUB_DEVICE \
+@@ -204,7 +201,6 @@ export GRUB_DEVICE \
    GRUB_DEVICE_PARTUUID \
    GRUB_DEVICE_BOOT \
    GRUB_DEVICE_BOOT_UUID \
@@ -31,7 +31,7 @@ index 1a70b7ea056..f55339a3f64 100644
    GRUB_FS \
    GRUB_FONT \
    GRUB_PRELOAD_MODULES \
-@@ -255,6 +251,7 @@ export GRUB_DEFAULT \
+@@ -246,6 +242,7 @@ export GRUB_DEFAULT \
    GRUB_BACKGROUND \
    GRUB_THEME \
    GRUB_GFXPAYLOAD_LINUX \
@@ -40,7 +40,7 @@ index 1a70b7ea056..f55339a3f64 100644
    GRUB_SAVEDEFAULT \
    GRUB_ENABLE_CRYPTODISK \
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 21bbace4647..7591edc58ed 100644
+index 94622481284..80685b15f4d 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -26,8 +26,8 @@ export TEXTDOMAINDIR="@localedir@"

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

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Fri, 12 Mar 2021 23:26:15 +0100
+Date: Fri, 11 Jun 2021 12:10:58 +0200
 Subject: [PATCH] Revert "templates: Disable the os-prober by default"
 
 This reverts commit e346414725a70e5c74ee87ca14e580c66f517666.
@@ -10,28 +10,28 @@ This reverts commit e346414725a70e5c74ee87ca14e580c66f517666.
  2 files changed, 9 insertions(+), 14 deletions(-)
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index cb5804fd6fe..d183575bc18 100644
+index f8b4b3b21a7..69f08d289f9 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
-@@ -1526,13 +1526,10 @@ boot sequence.  If you have problems, set this option to @samp{text} and
+@@ -1519,13 +1519,10 @@ boot sequence.  If you have problems, set this option to @samp{text} and
  GRUB will tell Linux to boot in normal text mode.
  
  @item GRUB_DISABLE_OS_PROBER
--The @command{grub2-mkconfig} has a feature to use the external
+-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{grub2-mkconfig} command.
+-@command{grub-mkconfig} command.
-+Normally, @command{grub2-mkconfig} will try to use the external
++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
-@@ -1860,9 +1857,10 @@ than zero; otherwise 0.
+@@ -1853,9 +1850,10 @@ than zero; otherwise 0.
  @section Multi-boot manual config
  
  Currently autogenerating config files for multi-boot environments depends on
@@ -46,7 +46,7 @@ index cb5804fd6fe..d183575bc18 100644
  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 7591edc58ed..3c9431cfcfb 100644
+index 80685b15f4d..1b91c102f35 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -26,8 +26,7 @@ export TEXTDOMAINDIR="@localedir@"

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

@@ -166,7 +166,7 @@ index 8cff7be0289..35b8f670602 100644
  
  /* Search the mods section from the PE32/PE32+ image. This code uses
 diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index 0cdb063bb1b..74360542062 100644
+index 9838fb2f50d..f6aef0ef649 100644
 --- a/grub-core/kern/efi/mm.c
 +++ b/grub-core/kern/efi/mm.c
 @@ -113,6 +113,38 @@ grub_efi_drop_alloc (grub_efi_physical_address_t address,

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

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

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

@@ -10,7 +10,7 @@ Apparently these go in a new place now.
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 74719416c4c..c0103b30d4e 100644
+index 7517fc49d98..8331f95b645 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -314,6 +314,14 @@ AC_SUBST(grubdirname)

0022-Add-devicetree-loading.patch

@@ -20,10 +20,10 @@ Signed-off-by: David A. Marlin <dmarlin@redhat.com>
  2 files changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index f8cbb8d7a2b..91d761bae80 100644
+index d3e879b8e5c..8ea2315ebc2 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -251,7 +251,8 @@ export GRUB_DEFAULT \
+@@ -248,7 +248,8 @@ export GRUB_DEFAULT \
    GRUB_ENABLE_CRYPTODISK \
    GRUB_BADRAM \
    GRUB_OS_PROBER_SKIP_LIST \

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

@@ -122,7 +122,7 @@ Replace a bunch of machine generated ones with ones that look nicer.
  create mode 100644 util/grub-sparc64-setup.8
 
 diff --git a/configure.ac b/configure.ac
-index c0103b30d4e..b8c4d52dfd1 100644
+index 8331f95b645..bec8535af70 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -77,6 +77,29 @@ grub_TRANSFORM([grub-set-default])

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

@@ -26,7 +26,7 @@ Signed-off-by: Thierry Vignaud <thierry.vignaud@gmail.com>
  create mode 100644 util/grub-rpm-sort.8
 
 diff --git a/configure.ac b/configure.ac
-index b8c4d52dfd1..ac84a8ccf69 100644
+index bec8535af70..fdcb452581c 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])

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

@@ -27,7 +27,7 @@ Andy Lutomirski <luto@kernel.org>
  create mode 100644 util/grub.d/01_users.in
 
 diff --git a/configure.ac b/configure.ac
-index ac84a8ccf69..9ecd3540bd6 100644
+index fdcb452581c..30fd84d8067 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
@@ -70,10 +70,10 @@ index ba4cf4b29b0..1a7dd433e33 100644
    name = grub-mkconfig_lib;
    common = util/grub-mkconfig_lib.in;
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 91d761bae80..3e4c6c5240b 100644
+index 8ea2315ebc2..ba14cf6261c 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -279,6 +279,8 @@ for i in "${grub_mkconfig_dir}"/* ; do
+@@ -276,6 +276,8 @@ for i in "${grub_mkconfig_dir}"/* ; do
      *~) ;;
      # emacsen autosave files. FIXME: support other editors
      */\#*\#) ;;

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

@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  6 files changed, 477 insertions(+), 14 deletions(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index e33be51f83b..8d9edaac447 100644
+index 6fb5627025d..e28fb6a09f9 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
 @@ -902,6 +902,179 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),

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

@@ -23,7 +23,7 @@ Resolves: rhbz#1226325
  create mode 100644 util/grub-get-kernel-settings.in
 
 diff --git a/configure.ac b/configure.ac
-index 9ecd3540bd6..281201f671e 100644
+index 30fd84d8067..ed31ea457d2 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -65,6 +65,7 @@ grub_TRANSFORM([grub-install])
@@ -214,7 +214,7 @@ index 00000000000..7e87dfccc0e
 +    echo export GRUB_UPDATE_DEFAULT_KERNEL
 +fi
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 3e4c6c5240b..60beaaa6962 100644
+index ba14cf6261c..005f093809b 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -45,6 +45,7 @@ grub_probe="${sbindir}/@grub_probe@"
@@ -225,7 +225,7 @@ index 3e4c6c5240b..60beaaa6962 100644
  
  export TEXTDOMAIN=@PACKAGE@
  export TEXTDOMAINDIR="@localedir@"
-@@ -161,6 +162,8 @@ if test -f ${sysconfdir}/default/grub ; then
+@@ -158,6 +159,8 @@ if test -f ${sysconfdir}/default/grub ; then
    . ${sysconfdir}/default/grub
  fi
  

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

@@ -13,7 +13,7 @@ Subject: [PATCH] Fix up some man pages rpmdiff noticed.
  create mode 100644 util/grub-syslinux2cfg.1
 
 diff --git a/configure.ac b/configure.ac
-index 281201f671e..6c16968ad9c 100644
+index ed31ea457d2..537ed411469 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -87,6 +87,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3])

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

@@ -9,11 +9,11 @@ time.
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  docs/grub-dev.texi |   4 +-
- docs/grub.texi     | 323 ++++++++++++++++++++++++++++-------------------------
+ docs/grub.texi     | 321 ++++++++++++++++++++++++++++-------------------------
- 2 files changed, 172 insertions(+), 155 deletions(-)
+ 2 files changed, 171 insertions(+), 154 deletions(-)
 
 diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
-index a834b3a9c32..a55af53fd45 100644
+index 6c629a23e2d..19f708ee662 100644
 --- a/docs/grub-dev.texi
 +++ b/docs/grub-dev.texi
 @@ -1,7 +1,7 @@
@@ -35,7 +35,7 @@ index a834b3a9c32..a55af53fd45 100644
  
  @setchapternewpage odd
 diff --git a/docs/grub.texi b/docs/grub.texi
-index eeb3118ebde..aa3a7de9d4f 100644
+index 69f08d289f9..0615d0ed97e 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
 @@ -1,7 +1,7 @@
@@ -366,22 +366,16 @@ index eeb3118ebde..aa3a7de9d4f 100644
  
  @item GRUB_GFXMODE
  Set the resolution used on the @samp{gfxterm} graphical terminal.  Note that
-@@ -1519,20 +1526,20 @@ boot sequence.  If you have problems, set this option to @samp{text} and
+@@ -1519,7 +1526,7 @@ boot sequence.  If you have problems, set this option to @samp{text} and
  GRUB will tell Linux to boot in normal text mode.
  
  @item GRUB_DISABLE_OS_PROBER
--The @command{grub-mkconfig} has a feature to use the external
+-Normally, @command{grub-mkconfig} will try to use the external
-+The @command{grub2-mkconfig} has a feature to use the external
++Normally, @command{grub2-mkconfig} will try to use the external
- @command{os-prober} program to discover other operating systems installed on
+ @command{os-prober} program, if installed, to discover other operating
- the same machine and generate appropriate menu entries for them. It is disabled
+ systems installed on the same system and generate appropriate menu entries
- by default since automatic and silent execution of @command{os-prober}, and
+ for them.  Set this option to @samp{true} to disable this.
- creating boot entries based on that data, is a potential attack vector. Set
+@@ -1529,7 +1536,7 @@ List of space-separated FS UUIDs of filesystems to be ignored from os-prober
- this option to @samp{false} to enable this feature in the
--@command{grub-mkconfig} command.
-+@command{grub2-mkconfig} command.
- 
- @item GRUB_OS_PROBER_SKIP_LIST
- List of space-separated FS UUIDs of filesystems to be ignored from os-prober
  output. For efi chainloaders it's <UUID>@@<EFI FILE>
  
  @item GRUB_DISABLE_SUBMENU
@@ -390,7 +384,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  the kernel with highest version number and put all other found kernels
  or alternative menu entries for recovery mode in submenu. For entries returned
  by @command{os-prober} first entry will be put on top level and all others
-@@ -1540,11 +1547,11 @@ in submenu. If this option is set to @samp{true}, flat menu with all entries
+@@ -1537,11 +1544,11 @@ in submenu. If this option is set to @samp{true}, flat menu with all entries
  on top level will be generated instead. Changing this option will require
  changing existing values of @samp{GRUB_DEFAULT}, @samp{fallback} (@pxref{fallback})
  and @samp{default} (@pxref{default}) environment variables as well as saved
@@ -405,7 +399,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  check for encrypted disks and generate additional commands needed to access
  them during boot.  Note that in this case unattended boot is not possible
  because GRUB will wait for passphrase to unlock encrypted container.
-@@ -1603,7 +1610,7 @@ confusing @samp{GRUB_TIMEOUT_STYLE=countdown} or
+@@ -1600,7 +1607,7 @@ confusing @samp{GRUB_TIMEOUT_STYLE=countdown} or
  
  @end table
  
@@ -414,7 +408,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  edit the scripts in @file{/etc/grub.d} directly.
  @file{/etc/grub.d/40_custom} is particularly useful for adding entire custom
  menu entries; simply type the menu entries you want to add at the end of
-@@ -1864,7 +1871,7 @@ images as well.
+@@ -1862,7 +1869,7 @@ images as well.
  Mount this partition on/mnt/boot and disable GRUB in all OSes and manually
  install self-compiled latest GRUB with:
  
@@ -423,7 +417,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  
  In all the OSes install GRUB tools but disable installing GRUB in bootsector,
  so you'll have menu.lst and grub.cfg available for use. Also disable os-prober
-@@ -1874,20 +1881,20 @@ use by setting:
+@@ -1872,20 +1879,20 @@ use by setting:
  
  in /etc/default/grub
  
@@ -447,7 +441,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  @}
  
  menuentry "Windows XP" @{
-@@ -1950,15 +1957,15 @@ GRUB supports embedding a configuration file directly into the core image,
+@@ -1948,15 +1955,15 @@ GRUB supports embedding a configuration file directly into the core image,
  so that it is loaded before entering normal mode.  This is useful, for
  example, when it is not straightforward to find the real configuration file,
  or when you need to debug problems with loading that file.
@@ -466,7 +460,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  
  After the embedded configuration file (if any) is executed, GRUB will load
  the @samp{normal} module (@pxref{normal}), which will then read the real
-@@ -1993,13 +2000,13 @@ included in the core image:
+@@ -1991,13 +1998,13 @@ included in the core image:
  @example
  @group
  search.fs_label grub root
@@ -484,7 +478,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
      else
          echo "Could not find an example configuration file!"
      fi
-@@ -2523,7 +2530,7 @@ grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i38
+@@ -2521,7 +2528,7 @@ grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i38
  @end group
  @end example
  
@@ -493,7 +487,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  server.
  
  The grub.cfg file is placed in the same directory as the path output by
-@@ -2717,7 +2724,7 @@ team are:
+@@ -2715,7 +2722,7 @@ team are:
  @end table
  
  To take full advantage of this function, install GRUB into the MBR
@@ -502,7 +496,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  
  If you have a laptop which has a similar feature and not in the above list
  could you figure your address and contribute?
-@@ -2778,7 +2785,7 @@ bytes.
+@@ -2776,7 +2783,7 @@ bytes.
  The sole function of @file{boot.img} is to read the first sector of the core
  image from a local disk and jump to it.  Because of the size restriction,
  @file{boot.img} cannot understand any file system structure, so
@@ -511,7 +505,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  core image into @file{boot.img} when installing GRUB.
  
  @item diskboot.img
-@@ -2808,7 +2815,7 @@ images.
+@@ -2806,7 +2813,7 @@ images.
  
  @item core.img
  This is the core image of GRUB.  It is built dynamically from the kernel
@@ -520,7 +514,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  program.  Usually, it contains enough modules to access @file{/boot/grub},
  and loads everything else (including menu handling, the ability to load
  target operating systems, and so on) from the file system at run-time.  The
-@@ -2860,7 +2867,7 @@ GRUB 2 has no single Stage 2 image.  Instead, it loads modules from
+@@ -2858,7 +2865,7 @@ GRUB 2 has no single Stage 2 image.  Instead, it loads modules from
  In GRUB 2, images for booting from CD-ROM drives are now constructed using
  @file{cdboot.img} and @file{core.img}, making sure that the core image
  contains the @samp{iso9660} module.  It is usually best to use the
@@ -529,7 +523,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  
  @item nbgrub
  There is as yet no equivalent for @file{nbgrub} in GRUB 2; it was used by
-@@ -3016,8 +3023,8 @@ There are two ways to specify files, by @dfn{absolute file name} and by
+@@ -3014,8 +3021,8 @@ There are two ways to specify files, by @dfn{absolute file name} and by
  
  An absolute file name resembles a Unix absolute file name, using
  @samp{/} for the directory separator (not @samp{\} as in DOS). One
@@ -540,7 +534,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  disk. If you omit the device name in an absolute file name, GRUB uses
  GRUB's @dfn{root device} implicitly. So if you set the root device to,
  say, @samp{(hd1,1)} by the command @samp{set root=(hd1,1)} (@pxref{set}),
-@@ -3025,8 +3032,8 @@ then @code{/boot/kernel} is the same as @code{(hd1,1)/boot/kernel}.
+@@ -3023,8 +3030,8 @@ then @code{/boot/kernel} is the same as @code{(hd1,1)/boot/kernel}.
  
  On ZFS filesystem the first path component must be
  @var{volume}@samp{@@}[@var{snapshot}].
@@ -551,7 +545,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  @samp{snap-129}.  Trailing @samp{@@} after volume name is mandatory even if
  snapshot name is omitted.
  
-@@ -3429,7 +3436,7 @@ The more recent release of Minix would then be identified as
+@@ -3427,7 +3434,7 @@ The more recent release of Minix would then be identified as
  @samp{other>minix>minix-3.4.0}.
  
  This variable is often set by @samp{GRUB_DEFAULT} (@pxref{Simple
@@ -560,7 +554,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  
  
  @node fallback
-@@ -3519,7 +3526,7 @@ If this variable is set, it names the language code that the
+@@ -3517,7 +3524,7 @@ If this variable is set, it names the language code that the
  example, French would be named as @samp{fr}, and Simplified Chinese as
  @samp{zh_CN}.
  
@@ -569,7 +563,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  reasonable default for this variable based on the system locale.
  
  
-@@ -3527,10 +3534,10 @@ reasonable default for this variable based on the system locale.
+@@ -3525,10 +3532,10 @@ reasonable default for this variable based on the system locale.
  @subsection locale_dir
  
  If this variable is set, it names the directory where translation files may
@@ -582,7 +576,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  default for this variable if internationalization is needed and any
  translation files are available.
  
-@@ -3648,7 +3655,7 @@ input.  The default is not to pause output.
+@@ -3646,7 +3653,7 @@ input.  The default is not to pause output.
  
  The location of the @samp{/boot/grub} directory as an absolute file name
  (@pxref{File name syntax}).  This is normally set by GRUB at startup based
@@ -591,7 +585,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  dynamically loaded from this directory, so it must be set correctly in order
  for many parts of GRUB to work.
  
-@@ -3739,17 +3746,17 @@ GRUB provides an ``environment block'' which can be used to save a small
+@@ -3737,17 +3744,17 @@ GRUB provides an ``environment block'' which can be used to save a small
  amount of state.
  
  The environment block is a preallocated 1024-byte file, which normally lives
@@ -612,7 +606,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  @samp{GRUB_SAVEDEFAULT} (@pxref{Simple configuration}).
  
  
-@@ -4473,7 +4480,7 @@ Translate @var{string} into the current language.
+@@ -4476,7 +4483,7 @@ Translate @var{string} into the current language.
  
  The current language code is stored in the @samp{lang} variable in GRUB's
  environment (@pxref{lang}).  Translation files in MO format are read from
@@ -621,7 +615,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  @end deffn
  
  
-@@ -4868,7 +4875,7 @@ Define a user named @var{user} with password @var{clear-password}.
+@@ -4871,7 +4878,7 @@ Define a user named @var{user} with password @var{clear-password}.
  
  @deffn Command password_pbkdf2 user hashed-password
  Define a user named @var{user} with password hash @var{hashed-password}.
@@ -630,7 +624,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  to generate password hashes.  @xref{Security}.
  @end deffn
  
-@@ -5811,8 +5818,8 @@ The @samp{password} (@pxref{password}) and @samp{password_pbkdf2}
+@@ -5814,8 +5821,8 @@ The @samp{password} (@pxref{password}) and @samp{password_pbkdf2}
  which has an associated password.  @samp{password} sets the password in
  plain text, requiring @file{grub.cfg} to be secure; @samp{password_pbkdf2}
  sets the password hashed using the Password-Based Key Derivation Function
@@ -641,7 +635,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  
  In order to enable authentication support, the @samp{superusers} environment
  variable must be set to a list of usernames, separated by any of spaces,
-@@ -5857,7 +5864,7 @@ menuentry "May be run by user1 or a superuser" --users user1 @{
+@@ -5860,7 +5867,7 @@ menuentry "May be run by user1 or a superuser" --users user1 @{
  @end group
  @end example
  
@@ -650,7 +644,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  generating configuration files with authentication.  You can use
  @file{/etc/grub.d/40_custom} to add simple superuser authentication, by
  adding @kbd{set superusers=} and @kbd{password} or @kbd{password_pbkdf2}
-@@ -5884,7 +5891,17 @@ may halt or otherwise impact the boot process.
+@@ -5887,7 +5894,17 @@ may halt or otherwise impact the boot process.
  
  An initial trusted public key can be embedded within the GRUB @file{core.img}
  using the @code{--pubkey} option to @command{grub-install}
@@ -669,7 +663,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  
  GRUB uses GPG-style detached signatures (meaning that a file
  @file{foo.sig} will be produced when file @file{foo} is signed), and
-@@ -5904,8 +5921,8 @@ gpg --detach-sign /path/to/file
+@@ -5907,8 +5924,8 @@ gpg --detach-sign /path/to/file
  For successful validation of all of GRUB's subcomponents and the
  loaded OS kernel, they must all be signed.  One way to accomplish this
  is the following (after having already produced the desired
@@ -680,7 +674,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  
  @example
  @group
-@@ -5927,7 +5944,7 @@ See also: @ref{check_signatures}, @ref{verify_detached}, @ref{trust},
+@@ -5930,7 +5947,7 @@ See also: @ref{check_signatures}, @ref{verify_detached}, @ref{trust},
  Note that internally signature enforcement is controlled by setting
  the environment variable @code{check_signatures} equal to
  @code{enforce}.  Passing one or more @code{--pubkey} options to
@@ -689,7 +683,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  equal to @code{enforce} in @file{core.img} prior to processing any
  configuration files.
  
-@@ -6385,10 +6402,10 @@ Required files are:
+@@ -6388,10 +6405,10 @@ Required files are:
  
  GRUB's normal start-up procedure involves setting the @samp{prefix}
  environment variable to a value set in the core image by
@@ -702,7 +696,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  things GRUB is supposed to do.
  
  If, instead, you only get a rescue shell, this usually means that GRUB
-@@ -6414,8 +6431,8 @@ normal
+@@ -6417,8 +6434,8 @@ normal
  
  However, any problem that leaves you in the rescue shell probably means that
  GRUB was not correctly installed.  It may be more useful to try to reinstall
@@ -713,7 +707,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  
  @itemize @bullet{}
  @item
-@@ -6427,7 +6444,7 @@ is usually better to use UUIDs or file system labels and avoid depending on
+@@ -6430,7 +6447,7 @@ is usually better to use UUIDs or file system labels and avoid depending on
  drive ordering entirely.
  
  @item
@@ -722,7 +716,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  to a partition but GRUB has already been installed in the master boot
  record, then the GRUB installation in the partition will be ignored.
  
-@@ -6458,21 +6475,21 @@ entry which claims partition start at block 0. This change will not hamper
+@@ -6461,21 +6478,21 @@ entry which claims partition start at block 0. This change will not hamper
  bootability on other machines.
  
  
@@ -750,7 +744,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  
  @table @option
  @item --help
-@@ -6488,13 +6505,13 @@ separate partition or a removable disk.
+@@ -6491,13 +6508,13 @@ separate partition or a removable disk.
  If this option is not specified then it defaults to @file{/boot}, so
  
  @example
@@ -766,7 +760,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  @end example
  
  Here is an example in which you have a separate @dfn{boot} partition which is 
-@@ -6502,16 +6519,16 @@ mounted on
+@@ -6505,16 +6522,16 @@ mounted on
  @file{/mnt/boot}:
  
  @example
@@ -786,7 +780,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  extra space in the bootloader embedding area for Reed-Solomon
  error-correcting codes. This enables GRUB to still boot successfully
  if some blocks are corrupted.  The exact amount of protection offered
-@@ -6524,17 +6541,17 @@ installation}) where GRUB does not reside in any unpartitioned space
+@@ -6527,17 +6544,17 @@ installation}) where GRUB does not reside in any unpartitioned space
  outside of the MBR.  Disable the Reed-Solomon codes with this option.
  @end table
  
@@ -809,7 +803,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  
  @table @option
  @item --help
-@@ -6550,17 +6567,17 @@ it to standard output.
+@@ -6553,17 +6570,17 @@ it to standard output.
  @end table
  
  
@@ -831,7 +825,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  
  @table @option
  @item -c @var{number}
-@@ -6578,23 +6595,23 @@ Length of the salt.  Defaults to 64.
+@@ -6581,23 +6598,23 @@ Length of the salt.  Defaults to 64.
  @end table
  
  
@@ -861,7 +855,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  
  @table @option
  @item --help
-@@ -6605,17 +6622,17 @@ Print the version number of GRUB and exit.
+@@ -6608,17 +6625,17 @@ Print the version number of GRUB and exit.
  @end table
  
  
@@ -883,7 +877,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  passed on directly to @command{xorriso} in @command{mkisofs} emulation mode.
  Options passed to @command{xorriso} will normally be interpreted as
  @command{mkisofs} options; if the option @samp{--} is used, then anything
-@@ -6630,7 +6647,7 @@ mkdir -p disk/boot/grub
+@@ -6633,7 +6650,7 @@ mkdir -p disk/boot/grub
  grub-mkrescue -o grub.iso disk
  @end example
  
@@ -892,7 +886,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  
  @table @option
  @item --help
-@@ -6658,15 +6675,15 @@ Use @var{file} as the @command{xorriso} program, rather than the built-in
+@@ -6661,15 +6678,15 @@ Use @var{file} as the @command{xorriso} program, rather than the built-in
  default.
  
  @item --grub-mkimage=@var{file}
@@ -912,7 +906,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  system or file system image that GRUB understands, using GRUB's file system
  drivers via FUSE.  (It is only available if FUSE development files were
  present when GRUB was built.)  This has a number of uses:
-@@ -6698,13 +6715,13 @@ even if nobody has yet written a FUSE module specifically for that file
+@@ -6701,13 +6718,13 @@ even if nobody has yet written a FUSE module specifically for that file
  system type.
  @end itemize
  
@@ -928,7 +922,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  non-option arguments (if it is given more than one image, it will treat them
  as a RAID set), and also accepts the following options:
  
-@@ -6726,13 +6743,13 @@ Show debugging output for conditions matching @var{string}.
+@@ -6729,13 +6746,13 @@ Show debugging output for conditions matching @var{string}.
  @item -K prompt|@var{file}
  @itemx --zfs-key=prompt|@var{file}
  Load a ZFS encryption key.  If you use @samp{prompt} as the argument,
@@ -944,7 +938,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  root of the supplied file system.
  
  If @var{device} is just a number, then it will be treated as a partition
-@@ -6750,10 +6767,10 @@ Print verbose messages.
+@@ -6753,10 +6770,10 @@ Print verbose messages.
  @end table
  
  
@@ -958,7 +952,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  or device.
  
  @example
-@@ -6761,7 +6778,7 @@ grub-probe --target=fs /boot/grub
+@@ -6764,7 +6781,7 @@ grub-probe --target=fs /boot/grub
  grub-probe --target=drive --device /dev/sda1
  @end example
  
@@ -967,7 +961,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  argument, and also accepts the following options:
  
  @table @option
-@@ -6774,16 +6791,16 @@ Print the version number of GRUB and exit.
+@@ -6777,16 +6794,16 @@ Print the version number of GRUB and exit.
  @item -d
  @itemx --device
  If this option is given, then the non-option argument is a system device
@@ -987,7 +981,7 @@ index eeb3118ebde..aa3a7de9d4f 100644
  
  @item -t @var{target}
  @itemx --target=@var{target}
-@@ -6836,19 +6853,19 @@ Print verbose messages.
+@@ -6839,19 +6856,19 @@ Print verbose messages.
  @end table
  
  

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

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

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

@@ -94,7 +94,7 @@ index ebcdd8f5e22..f044a880a76 100644
  			sizeof ("GRUB_DISTRIBUTOR=") - 1) == 0)
  	{
 diff --git a/util/grub-install.c b/util/grub-install.c
-index a0babe3eff9..427ae013701 100644
+index 0fbe7f78c6d..0f66f36d23a 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -827,6 +827,8 @@ fill_core_services (const char *core_services)

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

@@ -13,10 +13,10 @@ Signed-off-by: Michael Chang <mchang@suse.com>
  5 files changed, 38 insertions(+), 2 deletions(-)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 60beaaa6962..e671ce68aec 100644
+index 005f093809b..535c0f02499 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -255,7 +255,8 @@ export GRUB_DEFAULT \
+@@ -252,7 +252,8 @@ export GRUB_DEFAULT \
    GRUB_BADRAM \
    GRUB_OS_PROBER_SKIP_LIST \
    GRUB_DISABLE_SUBMENU \

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

@@ -460,7 +460,7 @@ index caf9b1ccd3f..28790307e00 100644
  grub_make_system_path_relative_to_its_root_os (const char *path)
  {
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 427ae013701..c03214bdfcf 100644
+index 0f66f36d23a..84ed6e88ecb 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -1569,6 +1569,55 @@ main (int argc, char *argv[])

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

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

0073-align-struct-efi_variable-better.patch

@@ -20,7 +20,7 @@ index 36d2dedf47e..9d93ba88bac 100644
 +} GRUB_PACKED GRUB_ALIGNED(8);
  #endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */
 diff --git a/include/grub/types.h b/include/grub/types.h
-index b36b26a79d4..30e57254889 100644
+index 0a3ff159136..ba446d99040 100644
 --- a/include/grub/types.h
 +++ b/include/grub/types.h
 @@ -29,6 +29,7 @@

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

@@ -43,7 +43,7 @@ index a2d1f577b9b..434fa4deda4 100644
  .SH SEE ALSO
  .BR "info grub"
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index e671ce68aec..1a70b7ea056 100644
+index 535c0f02499..f55339a3f64 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -50,6 +50,8 @@ grub_get_kernel_settings="${sbindir}/@grub_get_kernel_settings@"
@@ -73,7 +73,7 @@ index e671ce68aec..1a70b7ea056 100644
      -*)
  	gettext_printf "Unrecognized option \`%s'\n" "$option" 1>&2
  	usage
-@@ -256,7 +262,8 @@ export GRUB_DEFAULT \
+@@ -253,7 +259,8 @@ export GRUB_DEFAULT \
    GRUB_OS_PROBER_SKIP_LIST \
    GRUB_DISABLE_SUBMENU \
    GRUB_DEFAULT_DTB \

0081-Make-it-possible-to-enabled-build-id-sha1.patch

@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 27 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 6c16968ad9c..f4cfd06cbe6 100644
+index 537ed411469..b4455e4732d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1470,7 +1470,15 @@ grub_PROG_TARGET_CC

0087-Add-support-for-non-Ethernet-network-cards.patch

@@ -271,7 +271,7 @@ index 54306e3b16d..67b409a8acc 100644
  	/* Change operation to REPLY and send packet */
  	send_ethernet_packet (inf, &nb_reply, target, GRUB_NET_ETHERTYPE_ARP);
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 8d9edaac447..dd5c8d04da9 100644
+index e28fb6a09f9..08b6b2b5d6c 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
 @@ -233,7 +233,6 @@ grub_net_configure_by_dhcp_ack (const char *name,

0089-bootp-New-net_bootp6-command.patch

@@ -19,7 +19,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  5 files changed, 1002 insertions(+), 209 deletions(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index dd5c8d04da9..68c4df681b5 100644
+index 08b6b2b5d6c..fe93b80f1cf 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
 @@ -24,6 +24,98 @@

0091-grub.texi-Add-net_bootp6-doument.patch

@@ -12,10 +12,10 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
  1 file changed, 17 insertions(+)
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index aa3a7de9d4f..67bf8523ccb 100644
+index 0615d0ed97e..04ed6ac1f07 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
-@@ -5484,6 +5484,7 @@ This command is only available on AArch64 systems.
+@@ -5487,6 +5487,7 @@ This command is only available on AArch64 systems.
  * net_add_dns::                 Add a DNS server
  * net_add_route::               Add routing entry
  * net_bootp::                   Perform a bootp/DHCP autoconfiguration
@@ -23,7 +23,7 @@ index aa3a7de9d4f..67bf8523ccb 100644
  * net_del_addr::                Remove IP address from interface
  * net_del_dns::                 Remove a DNS server
  * net_del_route::               Remove a route entry
-@@ -5608,6 +5609,22 @@ Sets environment variable @samp{net_}@var{<card>}@samp{_boot_file}
+@@ -5611,6 +5612,22 @@ Sets environment variable @samp{net_}@var{<card>}@samp{_boot_file}
  
  @end deffn
  

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

@@ -22,7 +22,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
  2 files changed, 56 insertions(+)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 68c4df681b5..0b430489329 100644
+index fe93b80f1cf..8fb8918ae7e 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
 @@ -20,6 +20,7 @@

0095-Support-UEFI-networking-protocols.patch

@@ -4000,7 +4000,7 @@ index 0ce5e675ed7..55aed92722c 100644
 +#endif
  }
 diff --git a/util/grub-mknetdir.c b/util/grub-mknetdir.c
-index 602574d52e8..1a61e05c6ec 100644
+index a2461cda1c4..77958dd9dd5 100644
 --- a/util/grub-mknetdir.c
 +++ b/util/grub-mknetdir.c
 @@ -32,13 +32,15 @@
@@ -4063,7 +4063,7 @@ index 602574d52e8..1a61e05c6ec 100644
    grub_install_make_image_wrap (input_dir, prefix, output,
  				0, load_cfg,
  				targets[platform].mkimage_target, 0);
-@@ -192,7 +198,16 @@ main (int argc, char *argv[])
+@@ -195,7 +201,16 @@ main (int argc, char *argv[])
  
    grub_install_mkdir_p (base);
  

0098-Add-auto-hide-menu-support.patch

@@ -120,10 +120,10 @@ index 00000000000..ad175870a54
 +fi
 +EOF
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 9d6ea55bdd3..21bbace4647 100644
+index 4b27bd20153..3c9431cfcfb 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
-@@ -45,6 +45,7 @@ if [ -z "${OSPROBED}" ] ; then
+@@ -42,6 +42,7 @@ if [ -z "${OSPROBED}" ] ; then
  fi
  
  osx_entry() {
@@ -131,7 +131,7 @@ index 9d6ea55bdd3..21bbace4647 100644
      # TRANSLATORS: it refers on the OS residing on device %s
      onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
      hints=""
-@@ -105,6 +106,7 @@ for OS in ${OSPROBED} ; do
+@@ -102,6 +103,7 @@ for OS in ${OSPROBED} ; do
  
    case ${BOOT} in
      chain)
@@ -139,7 +139,7 @@ index 9d6ea55bdd3..21bbace4647 100644
  
  	  onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
        cat << EOF
-@@ -135,6 +137,7 @@ EOF
+@@ -132,6 +134,7 @@ EOF
  EOF
      ;;
      efi)
@@ -147,7 +147,7 @@ index 9d6ea55bdd3..21bbace4647 100644
  
  	EFIPATH=${DEVICE#*@}
  	DEVICE=${DEVICE%@*}
-@@ -179,6 +182,7 @@ EOF
+@@ -176,6 +179,7 @@ EOF
  	  LINITRD="${LINITRD#/boot}"
  	fi
  
@@ -155,7 +155,7 @@ index 9d6ea55bdd3..21bbace4647 100644
  	onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
  	recovery_params="$(echo "${LPARAMS}" | grep single)" || true
  	counter=1
-@@ -260,6 +264,7 @@ EOF
+@@ -257,6 +261,7 @@ EOF
        done
      ;;
      hurd)
@@ -163,7 +163,7 @@ index 9d6ea55bdd3..21bbace4647 100644
        onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
        cat << EOF
  menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class hurd --class gnu --class os \$menuentry_id_option 'osprober-gnuhurd-/boot/gnumach.gz-false-$(grub_get_device_id "${DEVICE}")' {
-@@ -286,6 +291,7 @@ EOF
+@@ -283,6 +288,7 @@ EOF
  EOF
      ;;
      minix)
@@ -171,7 +171,7 @@ index 9d6ea55bdd3..21bbace4647 100644
  	  cat << EOF
  menuentry "${LONGNAME} (on ${DEVICE}, Multiboot)" {
  EOF
-@@ -302,3 +308,15 @@ EOF
+@@ -299,3 +305,15 @@ EOF
      ;;
    esac
  done