From 1f092caba7a86c6046e07bef83a488e359a49449 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javierm@redhat.com>
Date: Sat, 1 Dec 2018 03:12:09 +0100
Subject: [PATCH] Drop two efinet patches that were causing issues and a bunch
 of other fixes

Add comments and revert logic changes in 01_fallback_counting
Remove quotes when reading ID value from /etc/os-release
  Related: rhbz#1650706
blscfg: expand grub_users before passing to grub_normal_add_menu_entry()
  Resolves: rhbz#1650706
Drop buggy downstream patch "efinet: retransmit if our device is busy"
  Resolves: rhbz#1649048
Make the menu entry users option argument to be optional
  Related: rhbz#1652434
10_linux_bls: add missing menu entries options
  Resolves: rhbz#1652434
Drop "Be more aggro about actually using the *configured* network device."
  Resolves: rhbz#1654388
Fix menu entry selection based on title
  Resolves: rhbz#1654936

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
---
 ...r-for-the-first-exclusive-reopen-of-.patch |   4 +-
 ...net-retransmit-if-our-device-is-busy.patch |  45 --
 ...out-actually-using-the-configured-ne.patch | 221 ----------
 ...ue-when-reading-username-and-passwor.patch |   0
 ...ub-password-will-not-be-read-1290803.patch |   0
 ...ub-setpassword-documentation-1290799.patch |   0
 ...le-issue-in-grub-setpassword-1294243.patch |   0
 ...rsistent-RAM-and-unknown-possible-fu.patch |   0
 ... 0072-efiemu-Fix-compilation-failure.patch |   0
 ...P-protocol-for-exclusive-use-by-grub.patch |   4 +-
 ...arser.patch => 0074-Add-a-url-parser.patch |   0
 ...net-and-bootp-add-support-for-dhcpv6.patch |  21 +-
 ...rnel-settings-and-use-it-in-10_linux.patch |   0
 ...0077-Normalize-slashes-in-tftp-paths.patch |   0
 ...h => 0078-Fix-malformed-tftp-packets.patch |   0
 ...1374141-fix-incorrect-mask-for-ppc64.patch |   0
 ... 0080-Make-grub_fatal-also-backtrace.patch |   0
 ...> 0081-Make-grub-editenv-build-again.patch |   0
 ...ix-up-some-man-pages-rpmdiff-noticed.patch |   0
 ...=> 0083-Make-exit-take-a-return-code.patch |   0
 ...fdt-has-address-cells-and-size-cells.patch |   0
 ...fo-pages-say-grub2-where-appropriate.patch |   0
 ...more-debug-info-in-our-module-loader.patch |   0
 ...-chainloader-entries-don-t-try-any-x.patch |   0
 ...-Add-ability-to-boot-from-subvolumes.patch |   0
 ...port-btrfs_subvol-and-btrfs_subvolid.patch |   0
 ...> 0090-grub2-btrfs-03-follow_default.patch |   0
 ...=> 0091-grub2-btrfs-04-grub2-install.patch |   0
 ...> 0092-grub2-btrfs-05-grub2-mkconfig.patch |   0
 ... => 0093-grub2-btrfs-06-subvol-mount.patch |   0
 ...ootable-Snapshot-submenu-in-grub.cfg.patch |   0
 ...subvol-name-scheme-to-support-old-sn.patch |   0
 ...-correctly-with-btrfs-snapshots-bsc-.patch |   0
 ...ocate_pool-and-grub_efi_free_pool-wr.patch |   0
 ...fi_.-memory-helpers-where-reasonable.patch |   0
 ...9-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch |   2 +-
 ...c-sized-arrays-since-we-don-t-build-.patch |   0
 ...nst.patch => 0101-don-t-ignore-const.patch |   0
 ...=> 0102-don-t-use-int-for-efi-status.patch |   0
 ...INIT-declare-its-function-prototypes.patch |   0
 ...104-editenv-handle-relative-symlinks.patch |   0
 ...e-libgrub.pp-depend-on-config-util.h.patch |   0
 ...-efi-as-HFS-on-ppc-machines-in-grub-.patch |   0
 ...d-xen-or-multiboot-2-modules-as-need.patch |   0
 ...-calibration-not-take-51-seconds-to-.patch |   0
 ...109-align-struct-efi_variable-better.patch |   0
 ...=> 0110-Add-quicksort-implementation.patch |   0
 ...nd-support-to-parse-BootLoaderSpec-c.patch |   0
 ...112-Add-BLS-support-to-grub-mkconfig.patch |   0
 ...d-grub_exit-definition-for-grub-emu-.patch |   0
 ...-backtrace-on-grub_abort-for-grub-em.patch |   0
 ...-blscfg-command-for-the-emu-platform.patch |   0
 ...nux-and-initrd-commands-for-grub-emu.patch |   0
 ...7-Fix-the-efidir-in-grub-setpassword.patch |   0
 ...h => 0118-Add-grub2-switch-to-blscfg.patch |   0
 ...patch => 0119-Add-grub_debug_enabled.patch |   0
 ...patch => 0120-make-better-backtraces.patch |   0
 ...w-our-startup-message-if-debug-is-se.patch |   0
 ...-some-minor-include-path-weirdnesses.patch |   0
 ...it-possible-to-enabled-build-id-sha1.patch |   0
 ...f-grub_dprintf-without-the-file-line.patch |   0
 ...dprintf-that-tells-us-load-addresses.patch |   0
 ...scan-different-BLS-directories-on-EF.patch |   0
 ...pport.patch => 0127-Core-TPM-support.patch |   0
 ....patch => 0128-Measure-kernel-initrd.patch |   0
 ...ch => 0129-Add-BIOS-boot-measurement.patch |   0
 ...re-kernel-and-initrd-on-BIOS-systems.patch |   0
 ... 0131-Measure-the-kernel-commandline.patch |   0
 ...mands.patch => 0132-Measure-commands.patch |   0
 ...Measure-multiboot-images-and-modules.patch |   0
 ...=> 0134-Fix-boot-when-there-s-no-TPM.patch |   0
 ...atch => 0135-Rework-TPM-measurements.patch |   0
 ...x.patch => 0136-Fix-event-log-prefix.patch |   0
 ...ot-menu-entry-as-default-when-using-.patch |   0
 ...-when-compiling-for-platforms-other-.patch |   0
 ...h => 0139-Make-TPM-errors-less-fatal.patch |   0
 ...cfg-handle-multiple-initramfs-images.patch |   0
 ...switch-to-blscfg-on-non-EFI-machines.patch |   0
 ...LS-Use-etcdefaultgrub-instead-of-etc.patch |   0
 ...ons-to-grub2-switch-to-blscfg-man-pa.patch |   0
 ...h-to-blscfg-to-generate-debug-BLS-wh.patch |   0
 ...h-to-blscfg-to-generate-BLS-fragment.patch |   0
 ...query-dev-mounted-in-boot-efi-as-boo.patch |   0
 ...ath-when-searching-kernels-images-if.patch |   0
 ...field-to-compare-entries-if-id-field.patch |   0
 ...d-to-BLS-generated-by-grub2-switch-t.patch |   0
 ...tch => 0150-Fixup-for-newer-compiler.patch |   0
 ...-export-the-start-and-_start-symbols.patch |   0
 ...plify-BLS-entry-key-val-pairs-lookup.patch |   0
 ...h-to-the-kernel-and-initrds-BLS-fiel.patch |   0
 ...p-leading-spaces-on-BLS-field-values.patch |   0
 ...tch => 0155-Fixup-for-newer-compiler.patch |   0
 ..._log_extend_event-function-prototype.patch |   0
 ...ch => 0157-TPM-Fix-compiler-warnings.patch |   0
 ...lscfg.in-get-rid-of-a-bunch-of-bashi.patch |   0
 ...lscfg.in-Better-boot-prefix-checking.patch |   0
 ...entries-as-BLS-directory-path-also-o.patch |   0
 ...-filename-as-menu-entry-id-and-for-c.patch |   0
 ...witch-to-blscfg-boot-prefix-handling.patch |   0
 ...-trim-arp-packets-with-abnormal-size.patch |   0
 ...> 0164-Use-xid-to-match-DHCP-replies.patch |   0
 ...pport-for-non-Ethernet-network-cards.patch |   8 +-
 ...lid-character-recongition-in-strto-l.patch |   0
 ...racketed-ipv6-addrs-and-port-numbers.patch |   0
 ...ed-ipv6-addrs-and-port-numbers-pjone.patch |   0
 ...=> 0169-bootp-New-net_bootp6-command.patch |  10 +-
 ...t-back-our-code-to-add-a-local-route.patch |   0
 ...=> 0171-efinet-UEFI-IPv6-PXE-support.patch |  12 +-
 ...172-grub.texi-Add-net_bootp6-doument.patch |   0
 ...essing-DHCPACK-packet-from-HTTP-Boot.patch |   0
 ...etting-network-from-UEFI-device-path.patch |  20 +-
 ...etting-DNS-server-from-UEFI-protocol.patch |  18 +-
 ...0176-Fix-one-more-coverity-complaint.patch |   0
 ...h => 0177-Fix-grub_net_hwaddr_to_str.patch |   0
 ...78-Support-UEFI-networking-protocols.patch |  28 +-
 ...> 0179-AUDIT-0-http-boot-tracker-bug.patch |   0
 ...efi_gop.c-Add-support-for-BLT_ONLY-a.patch |   0
 ... 0181-efi-uga-use-64-bit-for-fb_base.patch |   0
 ...ot-set-text-mode-until-we-actually-n.patch |   0
 ...grub_console_read_key_stroke-helper-.patch |   0
 ...nsole-Implement-getkeystatus-support.patch |   0
 ...status-helper-funtion-available-ever.patch |   0
 ...d-holding-SHIFT-as-user-interrupt-ke.patch |   0
 ...-incr-command-to-increment-integer-v.patch |   0
 ...h => 0188-Add-auto-hide-menu-support.patch |   0
 ...try-for-firmware-setup-on-UEFI-FastB.patch |   0
 ...> 0190-Add-grub-set-bootflag-utility.patch |   0
 ...Fix-grub-setpassword-o-s-output-path.patch |   0
 ...ssword-be-named-like-all-the-other-g.patch |   0
 ...b-boot-indeterminate.service-example.patch |   0
 ...e-Use-a-timeout-of-60s-for-menu_show.patch |   0
 ...hide-Reduce-number-of-save_env-calls.patch |   0
 ...-fix-use-with-sys-firmware-efi-efiva.patch |   0
 ...h => 0197-gentpl-add-disable-support.patch |   0
 ... => 0198-gentpl-add-pc-firmware-type.patch |   0
 ...=> 0199-blscfg-remove-unused-typedef.patch |   0
 ...-dynamically-allocate-default_blsdir.patch |   0
 ...fg-sort-BLS-entries-by-version-field.patch |   0
 ...-remove-NULL-guards-around-grub_free.patch |   0
 ...g-fix-filename-in-no-linux-key-error.patch |   0
 ...blscfg-don-t-leak-bls_entry.filename.patch |   0
 ...lscfg-fix-compilation-on-EFI-and-EMU.patch |   0
 ...-blscfg-and-loadenv-source-file-list.patch |   0
 ...f-the-linuxefi-linux16-linux-distinc.patch |   0
 ...lscfg-Only-fix-boot-prefix-for-non-g.patch |   0
 ...e-BLS-options-field-instead-of-showi.patch |   0
 ...to-search-BLS-snippets-in-boot-loade.patch |   0
 ...empt-to-sort-by-version-if-not-prese.patch |   0
 ...gic-to-read-the-grubenv-file-and-set.patch |   0
 ...auto_hide.in-to-01_menu_auto_hide.in.patch |   0
 ...e-the-firmware-acceleration-for-http.patch |   0
 ...ot_url-reflect-the-protocol-hostname.patch |   0
 ...t-multiboot2-and-linux16-modules-on-.patch |   0
 ...0217-Force-everything-to-use-python3.patch |   0
 ...patch => 0218-Fix-an-8-year-old-typo.patch |   0
 ...n-don-t-run-autoreconf-in-the-topdir.patch |   0
 ...n-tell-configure-which-cflags-utils-.patch |   0
 ...make-it-possible-to-run-checkers-on-.patch |   0
 ...fier-report-the-filename-or-modname-.patch |   0
 ...fs-not-duplicate-symbols-from-efinet.patch |   0
 ...24-Rework-how-the-fdt-command-builds.patch |   0
 ...able-non-wordsize-allocations-on-arm.patch |   0
 ...-R-.note.gnu.property-at-more-places.patch |   0
 ...nd-prefix-when-HTTP-path-is-relative.patch |   0
 ...ernel_header.hdr_offset-be-at-the-ri.patch |   0
 ...> 0229-Mark-some-unused-stuff-unused.patch |   0
 ...=> 0230-Make-grub_error-more-verbose.patch |   0
 ...eset-an-alias-for-the-reboot-command.patch |   0
 ...-debug-output-on-GOP-and-UGA-probing.patch |   0
 ....patch => 0233-Add-a-version-command.patch |   0
 ...dprintf-and-nerf-dprintf-in-script.c.patch |   0
 ...-Better-memory-allocation-and-error-.patch |   0
 ...tter-locations-for-kernel-and-initrd.patch |   0
 ...p-all-the-places-Wsign-compare-error.patch |   0
 ...gn-compare-Wno-conversion-Wno-error-.patch |   0
 ...s.timer-Add-a-few-Conditions-for-run.patch |   0
 ...ce-buffers-for-reading-to-addresses-.patch |   0
 ...-arrange-grub_cmd_linux-a-little-bit.patch |   0
 ...e-our-own-allocator-for-kernel-stuff.patch |   0
 ...itrd-params-cmdline-allocations-abov.patch |   0
 ...polkit-pkexec-for-grub-boot-success..patch |   0
 ...245-drop-TPM-support-for-legacy-BIOS.patch |   0
 ...unction-from-kernel.exec-to-the-blsc.patch |   0
 ...e-blscfg-module-for-powerpc-ieee1275.patch |   0
 ...lscfg-copy-blscfg-module-for-legacy-.patch |   0
 ... => 0249-Fix-getroot.c-s-trampolines.patch |   0
 ...not-allow-stack-trampolines-anywhere.patch |   0
 ...tch => 0251-Reimplement-boot_counter.patch |   0
 ...t-include-.conf-at-the-end-of-our-id.patch |   0
 ...settings-expose-some-more-config-var.patch |   0
 ...tch => 0254-Reimplement-boot_counter.patch |   0
 ...-grub.d-snippet-to-generate-menu-ent.patch |   0
 ...pts-in-grubenv-if-it-wasn-t-set-befo.patch |   0
 ...erything-with-rpm-package-comparison.patch |   0
 ...-grub2-rpm-sort-instead-of-ls-vr-to-.patch |   0
 ...-t-set-saved_entry-on-grub2-mkconfig.patch |   0
 ...lscfg-use-debug-instead-of-debug-as-.patch |   0
 ...ke-blscfg-debug-messages-more-useful.patch |   0
 ...l-end-pointer-have-the-right-constif.patch |   0
 ...ntry-selection-based-on-ID-and-title.patch |   0
 ...-revert-logic-changes-in-01_fallback.patch |  48 +++
 ...en-reading-ID-value-from-etc-os-rele.patch |  46 ++
 ...ub_users-before-passing-to-grub_norm.patch |  38 ++
 ...try-users-option-argument-to-be-opti.patch |  46 ++
 ...bls-add-missing-menu-entries-options.patch |  56 +++
 ...-menu-entry-selection-based-on-title.patch |  41 ++
 grub.patches                                  | 404 +++++++++---------
 grub2.spec                                    |  19 +-
 208 files changed, 559 insertions(+), 532 deletions(-)
 rename 0068-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch => 0066-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch (95%)
 delete mode 100644 0066-efinet-retransmit-if-our-device-is-busy.patch
 delete mode 100644 0067-Be-more-aggro-about-actually-using-the-configured-ne.patch
 rename 0069-Fix-security-issue-when-reading-username-and-passwor.patch => 0067-Fix-security-issue-when-reading-username-and-passwor.patch (100%)
 rename 0070-Warn-if-grub-password-will-not-be-read-1290803.patch => 0068-Warn-if-grub-password-will-not-be-read-1290803.patch (100%)
 rename 0071-Clean-up-grub-setpassword-documentation-1290799.patch => 0069-Clean-up-grub-setpassword-documentation-1290799.patch (100%)
 rename 0072-Fix-locale-issue-in-grub-setpassword-1294243.patch => 0070-Fix-locale-issue-in-grub-setpassword-1294243.patch (100%)
 rename 0073-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch => 0071-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch (100%)
 rename 0074-efiemu-Fix-compilation-failure.patch => 0072-efiemu-Fix-compilation-failure.patch (100%)
 rename 0075-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch => 0073-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch (95%)
 rename 0076-Add-a-url-parser.patch => 0074-Add-a-url-parser.patch (100%)
 rename 0077-efinet-and-bootp-add-support-for-dhcpv6.patch => 0075-efinet-and-bootp-add-support-for-dhcpv6.patch (97%)
 rename 0078-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch => 0076-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch (100%)
 rename 0079-Normalize-slashes-in-tftp-paths.patch => 0077-Normalize-slashes-in-tftp-paths.patch (100%)
 rename 0080-Fix-malformed-tftp-packets.patch => 0078-Fix-malformed-tftp-packets.patch (100%)
 rename 0081-bz1374141-fix-incorrect-mask-for-ppc64.patch => 0079-bz1374141-fix-incorrect-mask-for-ppc64.patch (100%)
 rename 0082-Make-grub_fatal-also-backtrace.patch => 0080-Make-grub_fatal-also-backtrace.patch (100%)
 rename 0083-Make-grub-editenv-build-again.patch => 0081-Make-grub-editenv-build-again.patch (100%)
 rename 0084-Fix-up-some-man-pages-rpmdiff-noticed.patch => 0082-Fix-up-some-man-pages-rpmdiff-noticed.patch (100%)
 rename 0085-Make-exit-take-a-return-code.patch => 0083-Make-exit-take-a-return-code.patch (100%)
 rename 0086-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch => 0084-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch (100%)
 rename 0087-Make-our-info-pages-say-grub2-where-appropriate.patch => 0085-Make-our-info-pages-say-grub2-where-appropriate.patch (100%)
 rename 0088-print-more-debug-info-in-our-module-loader.patch => 0086-print-more-debug-info-in-our-module-loader.patch (100%)
 rename 0089-macos-just-build-chainloader-entries-don-t-try-any-x.patch => 0087-macos-just-build-chainloader-entries-don-t-try-any-x.patch (100%)
 rename 0090-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch => 0088-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch (100%)
 rename 0091-export-btrfs_subvol-and-btrfs_subvolid.patch => 0089-export-btrfs_subvol-and-btrfs_subvolid.patch (100%)
 rename 0092-grub2-btrfs-03-follow_default.patch => 0090-grub2-btrfs-03-follow_default.patch (100%)
 rename 0093-grub2-btrfs-04-grub2-install.patch => 0091-grub2-btrfs-04-grub2-install.patch (100%)
 rename 0094-grub2-btrfs-05-grub2-mkconfig.patch => 0092-grub2-btrfs-05-grub2-mkconfig.patch (100%)
 rename 0095-grub2-btrfs-06-subvol-mount.patch => 0093-grub2-btrfs-06-subvol-mount.patch (100%)
 rename 0096-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch => 0094-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch (100%)
 rename 0097-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch => 0095-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch (100%)
 rename 0098-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch => 0096-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch (100%)
 rename 0099-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch => 0097-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch (100%)
 rename 0100-Use-grub_efi_.-memory-helpers-where-reasonable.patch => 0098-Use-grub_efi_.-memory-helpers-where-reasonable.patch (100%)
 rename 0101-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch => 0099-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch (97%)
 rename 0102-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch => 0100-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch (100%)
 rename 0103-don-t-ignore-const.patch => 0101-don-t-ignore-const.patch (100%)
 rename 0104-don-t-use-int-for-efi-status.patch => 0102-don-t-use-int-for-efi-status.patch (100%)
 rename 0105-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch => 0103-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch (100%)
 rename 0106-editenv-handle-relative-symlinks.patch => 0104-editenv-handle-relative-symlinks.patch (100%)
 rename 0107-Make-libgrub.pp-depend-on-config-util.h.patch => 0105-Make-libgrub.pp-depend-on-config-util.h.patch (100%)
 rename 0108-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch => 0106-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch (100%)
 rename 0109-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch => 0107-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch (100%)
 rename 0110-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch => 0108-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch (100%)
 rename 0111-align-struct-efi_variable-better.patch => 0109-align-struct-efi_variable-better.patch (100%)
 rename 0112-Add-quicksort-implementation.patch => 0110-Add-quicksort-implementation.patch (100%)
 rename 0113-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch => 0111-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch (100%)
 rename 0114-Add-BLS-support-to-grub-mkconfig.patch => 0112-Add-BLS-support-to-grub-mkconfig.patch (100%)
 rename 0115-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch => 0113-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch (100%)
 rename 0116-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch => 0114-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch (100%)
 rename 0117-Enable-blscfg-command-for-the-emu-platform.patch => 0115-Enable-blscfg-command-for-the-emu-platform.patch (100%)
 rename 0118-Add-linux-and-initrd-commands-for-grub-emu.patch => 0116-Add-linux-and-initrd-commands-for-grub-emu.patch (100%)
 rename 0119-Fix-the-efidir-in-grub-setpassword.patch => 0117-Fix-the-efidir-in-grub-setpassword.patch (100%)
 rename 0120-Add-grub2-switch-to-blscfg.patch => 0118-Add-grub2-switch-to-blscfg.patch (100%)
 rename 0121-Add-grub_debug_enabled.patch => 0119-Add-grub_debug_enabled.patch (100%)
 rename 0122-make-better-backtraces.patch => 0120-make-better-backtraces.patch (100%)
 rename 0123-normal-don-t-draw-our-startup-message-if-debug-is-se.patch => 0121-normal-don-t-draw-our-startup-message-if-debug-is-se.patch (100%)
 rename 0124-Work-around-some-minor-include-path-weirdnesses.patch => 0122-Work-around-some-minor-include-path-weirdnesses.patch (100%)
 rename 0125-Make-it-possible-to-enabled-build-id-sha1.patch => 0123-Make-it-possible-to-enabled-build-id-sha1.patch (100%)
 rename 0126-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch => 0124-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch (100%)
 rename 0127-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch => 0125-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch (100%)
 rename 0128-Only-attempt-to-scan-different-BLS-directories-on-EF.patch => 0126-Only-attempt-to-scan-different-BLS-directories-on-EF.patch (100%)
 rename 0129-Core-TPM-support.patch => 0127-Core-TPM-support.patch (100%)
 rename 0130-Measure-kernel-initrd.patch => 0128-Measure-kernel-initrd.patch (100%)
 rename 0131-Add-BIOS-boot-measurement.patch => 0129-Add-BIOS-boot-measurement.patch (100%)
 rename 0132-Measure-kernel-and-initrd-on-BIOS-systems.patch => 0130-Measure-kernel-and-initrd-on-BIOS-systems.patch (100%)
 rename 0133-Measure-the-kernel-commandline.patch => 0131-Measure-the-kernel-commandline.patch (100%)
 rename 0134-Measure-commands.patch => 0132-Measure-commands.patch (100%)
 rename 0135-Measure-multiboot-images-and-modules.patch => 0133-Measure-multiboot-images-and-modules.patch (100%)
 rename 0136-Fix-boot-when-there-s-no-TPM.patch => 0134-Fix-boot-when-there-s-no-TPM.patch (100%)
 rename 0137-Rework-TPM-measurements.patch => 0135-Rework-TPM-measurements.patch (100%)
 rename 0138-Fix-event-log-prefix.patch => 0136-Fix-event-log-prefix.patch (100%)
 rename 0139-Set-the-first-boot-menu-entry-as-default-when-using-.patch => 0137-Set-the-first-boot-menu-entry-as-default-when-using-.patch (100%)
 rename 0140-tpm-fix-warnings-when-compiling-for-platforms-other-.patch => 0138-tpm-fix-warnings-when-compiling-for-platforms-other-.patch (100%)
 rename 0141-Make-TPM-errors-less-fatal.patch => 0139-Make-TPM-errors-less-fatal.patch (100%)
 rename 0142-blscfg-handle-multiple-initramfs-images.patch => 0140-blscfg-handle-multiple-initramfs-images.patch (100%)
 rename 0143-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch => 0141-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch (100%)
 rename 0144-BLS-Use-etcdefaultgrub-instead-of-etc.patch => 0142-BLS-Use-etcdefaultgrub-instead-of-etc.patch (100%)
 rename 0145-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch => 0143-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch (100%)
 rename 0146-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch => 0144-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch (100%)
 rename 0147-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch => 0145-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch (100%)
 rename 0148-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch => 0146-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch (100%)
 rename 0149-Include-OSTree-path-when-searching-kernels-images-if.patch => 0147-Include-OSTree-path-when-searching-kernels-images-if.patch (100%)
 rename 0150-Use-BLS-version-field-to-compare-entries-if-id-field.patch => 0148-Use-BLS-version-field-to-compare-entries-if-id-field.patch (100%)
 rename 0151-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch => 0149-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch (100%)
 rename 0152-Fixup-for-newer-compiler.patch => 0150-Fixup-for-newer-compiler.patch (100%)
 rename 0153-Don-t-attempt-to-export-the-start-and-_start-symbols.patch => 0151-Don-t-attempt-to-export-the-start-and-_start-symbols.patch (100%)
 rename 0154-Simplify-BLS-entry-key-val-pairs-lookup.patch => 0152-Simplify-BLS-entry-key-val-pairs-lookup.patch (100%)
 rename 0155-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch => 0153-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch (100%)
 rename 0156-Skip-leading-spaces-on-BLS-field-values.patch => 0154-Skip-leading-spaces-on-BLS-field-values.patch (100%)
 rename 0157-Fixup-for-newer-compiler.patch => 0155-Fixup-for-newer-compiler.patch (100%)
 rename 0158-TPM-Fix-hash_log_extend_event-function-prototype.patch => 0156-TPM-Fix-hash_log_extend_event-function-prototype.patch (100%)
 rename 0159-TPM-Fix-compiler-warnings.patch => 0157-TPM-Fix-compiler-warnings.patch (100%)
 rename 0160-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch => 0158-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch (100%)
 rename 0161-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch => 0159-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch (100%)
 rename 0162-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch => 0160-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch (100%)
 rename 0163-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch => 0161-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch (100%)
 rename 0164-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch => 0162-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch (100%)
 rename 0165-Revert-trim-arp-packets-with-abnormal-size.patch => 0163-Revert-trim-arp-packets-with-abnormal-size.patch (100%)
 rename 0166-Use-xid-to-match-DHCP-replies.patch => 0164-Use-xid-to-match-DHCP-replies.patch (100%)
 rename 0167-Add-support-for-non-Ethernet-network-cards.patch => 0165-Add-support-for-non-Ethernet-network-cards.patch (99%)
 rename 0168-misc-fix-invalid-character-recongition-in-strto-l.patch => 0166-misc-fix-invalid-character-recongition-in-strto-l.patch (100%)
 rename 0169-net-read-bracketed-ipv6-addrs-and-port-numbers.patch => 0167-net-read-bracketed-ipv6-addrs-and-port-numbers.patch (100%)
 rename 0170-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch => 0168-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch (100%)
 rename 0171-bootp-New-net_bootp6-command.patch => 0169-bootp-New-net_bootp6-command.patch (99%)
 rename 0172-Put-back-our-code-to-add-a-local-route.patch => 0170-Put-back-our-code-to-add-a-local-route.patch (100%)
 rename 0173-efinet-UEFI-IPv6-PXE-support.patch => 0171-efinet-UEFI-IPv6-PXE-support.patch (92%)
 rename 0174-grub.texi-Add-net_bootp6-doument.patch => 0172-grub.texi-Add-net_bootp6-doument.patch (100%)
 rename 0175-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch => 0173-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch (100%)
 rename 0176-efinet-Setting-network-from-UEFI-device-path.patch => 0174-efinet-Setting-network-from-UEFI-device-path.patch (95%)
 rename 0177-efinet-Setting-DNS-server-from-UEFI-protocol.patch => 0175-efinet-Setting-DNS-server-from-UEFI-protocol.patch (95%)
 rename 0178-Fix-one-more-coverity-complaint.patch => 0176-Fix-one-more-coverity-complaint.patch (100%)
 rename 0179-Fix-grub_net_hwaddr_to_str.patch => 0177-Fix-grub_net_hwaddr_to_str.patch (100%)
 rename 0180-Support-UEFI-networking-protocols.patch => 0178-Support-UEFI-networking-protocols.patch (99%)
 rename 0181-AUDIT-0-http-boot-tracker-bug.patch => 0179-AUDIT-0-http-boot-tracker-bug.patch (100%)
 rename 0182-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch => 0180-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch (100%)
 rename 0183-efi-uga-use-64-bit-for-fb_base.patch => 0181-efi-uga-use-64-bit-for-fb_base.patch (100%)
 rename 0184-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch => 0182-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch (100%)
 rename 0185-EFI-console-Add-grub_console_read_key_stroke-helper-.patch => 0183-EFI-console-Add-grub_console_read_key_stroke-helper-.patch (100%)
 rename 0186-EFI-console-Implement-getkeystatus-support.patch => 0184-EFI-console-Implement-getkeystatus-support.patch (100%)
 rename 0187-Make-grub_getkeystatus-helper-funtion-available-ever.patch => 0185-Make-grub_getkeystatus-helper-funtion-available-ever.patch (100%)
 rename 0188-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch => 0186-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch (100%)
 rename 0189-grub-editenv-Add-incr-command-to-increment-integer-v.patch => 0187-grub-editenv-Add-incr-command-to-increment-integer-v.patch (100%)
 rename 0190-Add-auto-hide-menu-support.patch => 0188-Add-auto-hide-menu-support.patch (100%)
 rename 0191-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch => 0189-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch (100%)
 rename 0192-Add-grub-set-bootflag-utility.patch => 0190-Add-grub-set-bootflag-utility.patch (100%)
 rename 0193-Fix-grub-setpassword-o-s-output-path.patch => 0191-Fix-grub-setpassword-o-s-output-path.patch (100%)
 rename 0194-Make-grub-set-password-be-named-like-all-the-other-g.patch => 0192-Make-grub-set-password-be-named-like-all-the-other-g.patch (100%)
 rename 0195-docs-Add-grub-boot-indeterminate.service-example.patch => 0193-docs-Add-grub-boot-indeterminate.service-example.patch (100%)
 rename 0196-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch => 0194-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch (100%)
 rename 0197-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch => 0195-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch (100%)
 rename 0198-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch => 0196-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch (100%)
 rename 0199-gentpl-add-disable-support.patch => 0197-gentpl-add-disable-support.patch (100%)
 rename 0200-gentpl-add-pc-firmware-type.patch => 0198-gentpl-add-pc-firmware-type.patch (100%)
 rename 0201-blscfg-remove-unused-typedef.patch => 0199-blscfg-remove-unused-typedef.patch (100%)
 rename 0202-blscfg-don-t-dynamically-allocate-default_blsdir.patch => 0200-blscfg-don-t-dynamically-allocate-default_blsdir.patch (100%)
 rename 0203-blscfg-sort-BLS-entries-by-version-field.patch => 0201-blscfg-sort-BLS-entries-by-version-field.patch (100%)
 rename 0204-blscfg-remove-NULL-guards-around-grub_free.patch => 0202-blscfg-remove-NULL-guards-around-grub_free.patch (100%)
 rename 0205-blscfg-fix-filename-in-no-linux-key-error.patch => 0203-blscfg-fix-filename-in-no-linux-key-error.patch (100%)
 rename 0206-blscfg-don-t-leak-bls_entry.filename.patch => 0204-blscfg-don-t-leak-bls_entry.filename.patch (100%)
 rename 0207-blscfg-fix-compilation-on-EFI-and-EMU.patch => 0205-blscfg-fix-compilation-on-EFI-and-EMU.patch (100%)
 rename 0208-Add-loadenv-to-blscfg-and-loadenv-source-file-list.patch => 0206-Add-loadenv-to-blscfg-and-loadenv-source-file-list.patch (100%)
 rename 0209-blscfg-Get-rid-of-the-linuxefi-linux16-linux-distinc.patch => 0207-blscfg-Get-rid-of-the-linuxefi-linux16-linux-distinc.patch (100%)
 rename 0210-grub-switch-to-blscfg-Only-fix-boot-prefix-for-non-g.patch => 0208-grub-switch-to-blscfg-Only-fix-boot-prefix-for-non-g.patch (100%)
 rename 0211-blscfg-Expand-the-BLS-options-field-instead-of-showi.patch => 0209-blscfg-Expand-the-BLS-options-field-instead-of-showi.patch (100%)
 rename 0212-blscfg-Fallback-to-search-BLS-snippets-in-boot-loade.patch => 0210-blscfg-Fallback-to-search-BLS-snippets-in-boot-loade.patch (100%)
 rename 0213-blscfg-Don-t-attempt-to-sort-by-version-if-not-prese.patch => 0211-blscfg-Don-t-attempt-to-sort-by-version-if-not-prese.patch (100%)
 rename 0214-blscfg-remove-logic-to-read-the-grubenv-file-and-set.patch => 0212-blscfg-remove-logic-to-read-the-grubenv-file-and-set.patch (100%)
 rename 0215-Rename-00_menu_auto_hide.in-to-01_menu_auto_hide.in.patch => 0213-Rename-00_menu_auto_hide.in-to-01_menu_auto_hide.in.patch (100%)
 rename 0216-efinet-also-use-the-firmware-acceleration-for-http.patch => 0214-efinet-also-use-the-firmware-acceleration-for-http.patch (100%)
 rename 0217-efi-http-Make-root_url-reflect-the-protocol-hostname.patch => 0215-efi-http-Make-root_url-reflect-the-protocol-hostname.patch (100%)
 rename 0218-Disable-multiboot-multiboot2-and-linux16-modules-on-.patch => 0216-Disable-multiboot-multiboot2-and-linux16-modules-on-.patch (100%)
 rename 0219-Force-everything-to-use-python3.patch => 0217-Force-everything-to-use-python3.patch (100%)
 rename 0220-Fix-an-8-year-old-typo.patch => 0218-Fix-an-8-year-old-typo.patch (100%)
 rename 0221-autogen-don-t-run-autoreconf-in-the-topdir.patch => 0219-autogen-don-t-run-autoreconf-in-the-topdir.patch (100%)
 rename 0222-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch => 0220-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch (100%)
 rename 0223-module-verifier-make-it-possible-to-run-checkers-on-.patch => 0221-module-verifier-make-it-possible-to-run-checkers-on-.patch (100%)
 rename 0224-grub-module-verifier-report-the-filename-or-modname-.patch => 0222-grub-module-verifier-report-the-filename-or-modname-.patch (100%)
 rename 0225-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch => 0223-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch (100%)
 rename 0226-Rework-how-the-fdt-command-builds.patch => 0224-Rework-how-the-fdt-command-builds.patch (100%)
 rename 0227-Disable-non-wordsize-allocations-on-arm.patch => 0225-Disable-non-wordsize-allocations-on-arm.patch (100%)
 rename 0228-strip-R-.note.gnu.property-at-more-places.patch => 0226-strip-R-.note.gnu.property-at-more-places.patch (100%)
 rename 0229-Prepend-prefix-when-HTTP-path-is-relative.patch => 0227-Prepend-prefix-when-HTTP-path-is-relative.patch (100%)
 rename 0230-Make-linux_arm_kernel_header.hdr_offset-be-at-the-ri.patch => 0228-Make-linux_arm_kernel_header.hdr_offset-be-at-the-ri.patch (100%)
 rename 0231-Mark-some-unused-stuff-unused.patch => 0229-Mark-some-unused-stuff-unused.patch (100%)
 rename 0232-Make-grub_error-more-verbose.patch => 0230-Make-grub_error-more-verbose.patch (100%)
 rename 0233-Make-reset-an-alias-for-the-reboot-command.patch => 0231-Make-reset-an-alias-for-the-reboot-command.patch (100%)
 rename 0234-EFI-more-debug-output-on-GOP-and-UGA-probing.patch => 0232-EFI-more-debug-output-on-GOP-and-UGA-probing.patch (100%)
 rename 0235-Add-a-version-command.patch => 0233-Add-a-version-command.patch (100%)
 rename 0236-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch => 0234-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch (100%)
 rename 0237-arm-arm64-loader-Better-memory-allocation-and-error-.patch => 0235-arm-arm64-loader-Better-memory-allocation-and-error-.patch (100%)
 rename 0238-Try-to-pick-better-locations-for-kernel-and-initrd.patch => 0236-Try-to-pick-better-locations-for-kernel-and-initrd.patch (100%)
 rename 0239-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch => 0237-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch (100%)
 rename 0240-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch => 0238-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch (100%)
 rename 0241-grub-boot-success.timer-Add-a-few-Conditions-for-run.patch => 0239-grub-boot-success.timer-Add-a-few-Conditions-for-run.patch (100%)
 rename 0242-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch => 0240-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch (100%)
 rename 0243-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch => 0241-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch (100%)
 rename 0244-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch => 0242-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch (100%)
 rename 0245-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch => 0243-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch (100%)
 rename 0246-docs-Stop-using-polkit-pkexec-for-grub-boot-success..patch => 0244-docs-Stop-using-polkit-pkexec-for-grub-boot-success..patch (100%)
 rename 0247-drop-TPM-support-for-legacy-BIOS.patch => 0245-drop-TPM-support-for-legacy-BIOS.patch (100%)
 rename 0248-Move-quicksort-function-from-kernel.exec-to-the-blsc.patch => 0246-Move-quicksort-function-from-kernel.exec-to-the-blsc.patch (100%)
 rename 0249-Include-blscfg-module-for-powerpc-ieee1275.patch => 0247-Include-blscfg-module-for-powerpc-ieee1275.patch (100%)
 rename 0250-grub-switch-to-blscfg-copy-blscfg-module-for-legacy-.patch => 0248-grub-switch-to-blscfg-copy-blscfg-module-for-legacy-.patch (100%)
 rename 0251-Fix-getroot.c-s-trampolines.patch => 0249-Fix-getroot.c-s-trampolines.patch (100%)
 rename 0252-Do-not-allow-stack-trampolines-anywhere.patch => 0250-Do-not-allow-stack-trampolines-anywhere.patch (100%)
 rename 0253-Reimplement-boot_counter.patch => 0251-Reimplement-boot_counter.patch (100%)
 rename 0254-blscfg-don-t-include-.conf-at-the-end-of-our-id.patch => 0252-blscfg-don-t-include-.conf-at-the-end-of-our-id.patch (100%)
 rename 0255-grub-get-kernel-settings-expose-some-more-config-var.patch => 0253-grub-get-kernel-settings-expose-some-more-config-var.patch (100%)
 rename 0256-Reimplement-boot_counter.patch => 0254-Reimplement-boot_counter.patch (100%)
 rename 0257-add-10_linux_bls-grub.d-snippet-to-generate-menu-ent.patch => 0255-add-10_linux_bls-grub.d-snippet-to-generate-menu-ent.patch (100%)
 rename 0258-Only-set-kernelopts-in-grubenv-if-it-wasn-t-set-befo.patch => 0256-Only-set-kernelopts-in-grubenv-if-it-wasn-t-set-befo.patch (100%)
 rename 0259-blscfg-sort-everything-with-rpm-package-comparison.patch => 0257-blscfg-sort-everything-with-rpm-package-comparison.patch (100%)
 rename 0260-10_linux_bls-use-grub2-rpm-sort-instead-of-ls-vr-to-.patch => 0258-10_linux_bls-use-grub2-rpm-sort-instead-of-ls-vr-to-.patch (100%)
 rename 0261-don-t-set-saved_entry-on-grub2-mkconfig.patch => 0259-don-t-set-saved_entry-on-grub2-mkconfig.patch (100%)
 rename 0262-grub-switch-to-blscfg-use-debug-instead-of-debug-as-.patch => 0260-grub-switch-to-blscfg-use-debug-instead-of-debug-as-.patch (100%)
 rename 0263-Make-blscfg-debug-messages-more-useful.patch => 0261-Make-blscfg-debug-messages-more-useful.patch (100%)
 rename 0264-Make-grub_strtoul-end-pointer-have-the-right-constif.patch => 0262-Make-grub_strtoul-end-pointer-have-the-right-constif.patch (100%)
 rename 0265-Fix-menu-entry-selection-based-on-ID-and-title.patch => 0263-Fix-menu-entry-selection-based-on-ID-and-title.patch (100%)
 create mode 100644 0264-Add-comments-and-revert-logic-changes-in-01_fallback.patch
 create mode 100644 0265-Remove-quotes-when-reading-ID-value-from-etc-os-rele.patch
 create mode 100644 0266-blscfg-expand-grub_users-before-passing-to-grub_norm.patch
 create mode 100644 0267-Make-the-menu-entry-users-option-argument-to-be-opti.patch
 create mode 100644 0268-10_linux_bls-add-missing-menu-entries-options.patch
 create mode 100644 0269-Fix-menu-entry-selection-based-on-title.patch

diff --git a/0068-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch b/0066-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
similarity index 95%
rename from 0068-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
rename to 0066-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
index f337c744..691d4dc4 100644
--- a/0068-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
+++ b/0066-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] efinet: add filter for the first exclusive reopen of SNP
  1 file changed, 39 insertions(+)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index a3ce4c67cce..b870d3f1938 100644
+index 5388f952ba9..d15a799f29a 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
-@@ -465,6 +465,45 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -383,6 +383,45 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  				    &pxe_mode->dhcp_ack,
  				    sizeof (pxe_mode->dhcp_ack),
  				    1, device, path);
diff --git a/0066-efinet-retransmit-if-our-device-is-busy.patch b/0066-efinet-retransmit-if-our-device-is-busy.patch
deleted file mode 100644
index 5bbc00ba..00000000
--- a/0066-efinet-retransmit-if-our-device-is-busy.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Josef Bacik <jbacik@fb.com>
-Date: Mon, 31 Aug 2015 13:34:35 -0400
-Subject: [PATCH] efinet: retransmit if our device is busy
-
-When I fixed the txbuf handling I ripped out the retransmission code since it
-was flooding our network when we had the buggy behavior.  Turns out this was too
-heavy handed as we can still have transient tx timeouts.  So instead make sure
-we retry our transmission once per timeout.  This way we can deal with transient
-transmission problems without flooding the box.  This fixes an issue we were
-seeing in production.  Thanks,
-
-Signed-off-by: Josef Bacik <jbacik@fb.com>
----
- grub-core/net/drivers/efi/efinet.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 5388f952ba9..3f112438a93 100644
---- a/grub-core/net/drivers/efi/efinet.c
-+++ b/grub-core/net/drivers/efi/efinet.c
-@@ -38,6 +38,7 @@ send_card_buffer (struct grub_net_card *dev,
-   grub_efi_simple_network_t *net = dev->efi_net;
-   grub_uint64_t limit_time = grub_get_time_ms () + 4000;
-   void *txbuf;
-+  int retry = 0;
- 
-   if (dev->txbusy)
-     while (1)
-@@ -60,6 +61,15 @@ send_card_buffer (struct grub_net_card *dev,
- 	    dev->txbusy = 0;
- 	    break;
- 	  }
-+	if (!retry)
-+	  {
-+	    st = efi_call_7 (net->transmit, net, 0, dev->last_pkt_size,
-+			     dev->txbuf, NULL, NULL, NULL);
-+	    if (st != GRUB_EFI_SUCCESS)
-+	      return grub_error (GRUB_ERR_IO,
-+				 N_("couldn't send network packet"));
-+	    retry = 1;
-+	  }
- 	if (limit_time < grub_get_time_ms ())
- 	  return grub_error (GRUB_ERR_TIMEOUT,
- 			     N_("couldn't send network packet"));
diff --git a/0067-Be-more-aggro-about-actually-using-the-configured-ne.patch b/0067-Be-more-aggro-about-actually-using-the-configured-ne.patch
deleted file mode 100644
index 79e23480..00000000
--- a/0067-Be-more-aggro-about-actually-using-the-configured-ne.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Fri, 11 Sep 2015 17:30:49 -0400
-Subject: [PATCH] Be more aggro about actually using the *configured* network
- device.
-
-Right now we use any SNP device with the same mac+IP block, but when
-it's discovered there will be more than one of them.  We need to pick
-the same one we were loaded with, so that  it'll be configured the same
-way as it was before, and won't be re-used by the system firmware later.
-
-Resolves: rhbz#1257475
-
-Signed-off-by: Peter Jones <example@example.com>
----
- grub-core/net/drivers/efi/efinet.c | 124 +++++++++++++++++++++++++++++--------
- include/grub/efi/api.h             |   4 ++
- 2 files changed, 102 insertions(+), 26 deletions(-)
-
-diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 3f112438a93..a3ce4c67cce 100644
---- a/grub-core/net/drivers/efi/efinet.c
-+++ b/grub-core/net/drivers/efi/efinet.c
-@@ -239,46 +239,85 @@ grub_efinet_get_device_handle (struct grub_net_card *card)
-   return card->efi_handle;
- }
- 
--static void
--grub_efinet_findcards (void)
-+static int
-+grub_efinet_find_snp_cards (int preferred_only, grub_efi_handle_t preferred,
-+			    int *i)
- {
--  grub_efi_uintn_t num_handles;
--  grub_efi_handle_t *handles;
-+  grub_efi_uintn_t num_handles = 0;
-+  grub_efi_handle_t *handles = NULL;
-   grub_efi_handle_t *handle;
--  int i = 0;
-+  grub_efi_device_path_t *pdp = NULL, *pp = NULL, *pc = NULL;
-+  int ret = 0;
- 
--  /* Find handles which support the disk io interface.  */
-+  if (preferred)
-+    {
-+      grub_efi_device_path_t *pdpc;
-+      pdpc = pdp = grub_efi_get_device_path (preferred);
-+      if (pdp == NULL)
-+	{
-+	  grub_print_error ();
-+	  return -1;
-+	}
-+
-+      for (; ! GRUB_EFI_END_ENTIRE_DEVICE_PATH (pdpc);
-+	   pdpc = GRUB_EFI_NEXT_DEVICE_PATH (pdpc))
-+	{
-+	  pp = pc;
-+	  pc = pdpc;
-+	}
-+    }
-+
-+  /* Find handles which support the SNP interface.  */
-   handles = grub_efi_locate_handle (GRUB_EFI_BY_PROTOCOL, &net_io_guid,
- 				    0, &num_handles);
--  if (! handles)
--    return;
--  for (handle = handles; num_handles--; handle++)
-+
-+  for (handle = handles; handle && num_handles--; handle++)
-     {
-       grub_efi_simple_network_t *net;
-       struct grub_net_card *card;
-       grub_efi_device_path_t *dp, *parent = NULL, *child = NULL;
- 
--      /* EDK2 UEFI PXE driver creates IPv4 and IPv6 messaging devices as
--	 children of main MAC messaging device. We only need one device with
--	 bound SNP per physical card, otherwise they compete with each other
--	 when polling for incoming packets.
--       */
-+      /* if we're looking for only the preferred handle, skip anything that
-+	 isn't it. */
-+      if (preferred_only && preferred != NULL && *handle != preferred)
-+	continue;
-+
-+      /* if we're not looking for the preferred handle, skip it if it's
-+	 found. */
-+      if (!preferred_only && *handle == preferred)
-+	continue;
-+
-       dp = grub_efi_get_device_path (*handle);
-       if (!dp)
- 	continue;
--      for (; ! GRUB_EFI_END_ENTIRE_DEVICE_PATH (dp); dp = GRUB_EFI_NEXT_DEVICE_PATH (dp))
-+
-+      for (; ! GRUB_EFI_END_ENTIRE_DEVICE_PATH (dp);
-+	   dp = GRUB_EFI_NEXT_DEVICE_PATH (dp))
- 	{
- 	  parent = child;
- 	  child = dp;
- 	}
--      if (child
--	  && GRUB_EFI_DEVICE_PATH_TYPE (child) == GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
--	  && (GRUB_EFI_DEVICE_PATH_SUBTYPE (child) == GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE
--	      || GRUB_EFI_DEVICE_PATH_SUBTYPE (child) == GRUB_EFI_IPV6_DEVICE_PATH_SUBTYPE)
--	  && parent
--	  && GRUB_EFI_DEVICE_PATH_TYPE (parent) == GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
--	  && GRUB_EFI_DEVICE_PATH_SUBTYPE (parent) == GRUB_EFI_MAC_ADDRESS_DEVICE_PATH_SUBTYPE)
--	continue;
-+
-+      if (!preferred_only)
-+	{
-+	  if (pp && pc
-+	      && grub_efi_compare_device_paths (pp, parent) == 0
-+	      && grub_efi_compare_device_paths (pc, child) == 0)
-+	    continue;
-+
-+	  if (child
-+	      && (GRUB_EFI_DEVICE_PATH_IS_TYPE(child,
-+					  GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE,
-+					  GRUB_EFI_IPV6_DEVICE_PATH_SUBTYPE) ||
-+		  GRUB_EFI_DEVICE_PATH_IS_TYPE(child,
-+					  GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE,
-+					  GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE))
-+	      && parent
-+	      && (GRUB_EFI_DEVICE_PATH_IS_TYPE(parent,
-+				    GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE,
-+				    GRUB_EFI_MAC_ADDRESS_DEVICE_PATH_SUBTYPE)))
-+	    continue;
-+	}
- 
-       net = grub_efi_open_protocol (*handle, &net_io_guid,
- 				    GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
-@@ -302,7 +341,7 @@ grub_efinet_findcards (void)
- 	{
- 	  grub_print_error ();
- 	  grub_free (handles);
--	  return;
-+	  return -1;
- 	}
- 
-       card->mtu = net->mode->max_packet_size;
-@@ -313,13 +352,14 @@ grub_efinet_findcards (void)
- 	  grub_print_error ();
- 	  grub_free (handles);
- 	  grub_free (card);
--	  return;
-+	  return -1;
- 	}
-       card->txbusy = 0;
- 
-       card->rcvbufsize = ALIGN_UP (card->mtu, 64) + 256;
- 
--      card->name = grub_xasprintf ("efinet%d", i++);
-+      card->name = grub_xasprintf ("efinet%d", *i);
-+      *i = (*i)+1;
-       card->driver = &efidriver;
-       card->flags = 0;
-       card->default_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
-@@ -330,8 +370,38 @@ grub_efinet_findcards (void)
-       card->efi_handle = *handle;
- 
-       grub_net_card_register (card);
-+      ret++;
-     }
-   grub_free (handles);
-+
-+  return ret;
-+}
-+
-+static void
-+grub_efinet_findcards (void)
-+{
-+  grub_efi_loaded_image_t *image = NULL;
-+  int rc;
-+  int efinet_number = 0;
-+
-+  image = grub_efi_get_loaded_image (grub_efi_image_handle);
-+
-+  if (image && image->device_handle)
-+    {
-+      rc = grub_efinet_find_snp_cards (1, image->device_handle, &efinet_number);
-+      if (rc < 0)
-+	return;
-+
-+      rc = grub_efinet_find_snp_cards (0, image->device_handle, &efinet_number);
-+      if (rc < 0)
-+	return;
-+    }
-+  else
-+    {
-+      rc = grub_efinet_find_snp_cards (0, NULL, &efinet_number);
-+      if (rc < 0)
-+	return;
-+    }
- }
- 
- static void
-@@ -352,6 +422,8 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
-     struct grub_efi_pxe_mode *pxe_mode;
-     if (card->driver != &efidriver)
-       continue;
-+    if (hnd != card->efi_handle)
-+      continue;
-     cdp = grub_efi_get_device_path (card->efi_handle);
-     if (! cdp)
-       continue;
-diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index c7c9f0e1db1..97b9aa7a4d7 100644
---- a/include/grub/efi/api.h
-+++ b/include/grub/efi/api.h
-@@ -622,6 +622,10 @@ typedef struct grub_efi_device_path grub_efi_device_path_t;
-    It seems to be identical to EFI_DEVICE_PATH.  */
- typedef struct grub_efi_device_path grub_efi_device_path_protocol_t;
- 
-+#define GRUB_EFI_DEVICE_PATH_IS_TYPE(dp, type, subtype) \
-+	((GRUB_EFI_DEVICE_PATH_TYPE(dp) == (type)) && \
-+	 (GRUB_EFI_DEVICE_PATH_SUBTYPE(dp) == (subtype)))
-+
- #define GRUB_EFI_DEVICE_PATH_TYPE(dp)		((dp)->type & 0x7f)
- #define GRUB_EFI_DEVICE_PATH_SUBTYPE(dp)	((dp)->subtype)
- #define GRUB_EFI_DEVICE_PATH_LENGTH(dp)		((dp)->length)
diff --git a/0069-Fix-security-issue-when-reading-username-and-passwor.patch b/0067-Fix-security-issue-when-reading-username-and-passwor.patch
similarity index 100%
rename from 0069-Fix-security-issue-when-reading-username-and-passwor.patch
rename to 0067-Fix-security-issue-when-reading-username-and-passwor.patch
diff --git a/0070-Warn-if-grub-password-will-not-be-read-1290803.patch b/0068-Warn-if-grub-password-will-not-be-read-1290803.patch
similarity index 100%
rename from 0070-Warn-if-grub-password-will-not-be-read-1290803.patch
rename to 0068-Warn-if-grub-password-will-not-be-read-1290803.patch
diff --git a/0071-Clean-up-grub-setpassword-documentation-1290799.patch b/0069-Clean-up-grub-setpassword-documentation-1290799.patch
similarity index 100%
rename from 0071-Clean-up-grub-setpassword-documentation-1290799.patch
rename to 0069-Clean-up-grub-setpassword-documentation-1290799.patch
diff --git a/0072-Fix-locale-issue-in-grub-setpassword-1294243.patch b/0070-Fix-locale-issue-in-grub-setpassword-1294243.patch
similarity index 100%
rename from 0072-Fix-locale-issue-in-grub-setpassword-1294243.patch
rename to 0070-Fix-locale-issue-in-grub-setpassword-1294243.patch
diff --git a/0073-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch b/0071-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch
similarity index 100%
rename from 0073-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch
rename to 0071-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch
diff --git a/0074-efiemu-Fix-compilation-failure.patch b/0072-efiemu-Fix-compilation-failure.patch
similarity index 100%
rename from 0074-efiemu-Fix-compilation-failure.patch
rename to 0072-efiemu-Fix-compilation-failure.patch
diff --git a/0075-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0073-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
similarity index 95%
rename from 0075-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
rename to 0073-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
index d6f026ae..94822998 100644
--- a/0075-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+++ b/0073-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
@@ -14,10 +14,10 @@ This reverts commit 147daeab22db793978f952b6f0d832919a1b0081.
  1 file changed, 39 deletions(-)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index b870d3f1938..a3ce4c67cce 100644
+index d15a799f29a..5388f952ba9 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
-@@ -465,45 +465,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -383,45 +383,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  				    &pxe_mode->dhcp_ack,
  				    sizeof (pxe_mode->dhcp_ack),
  				    1, device, path);
diff --git a/0076-Add-a-url-parser.patch b/0074-Add-a-url-parser.patch
similarity index 100%
rename from 0076-Add-a-url-parser.patch
rename to 0074-Add-a-url-parser.patch
diff --git a/0077-efinet-and-bootp-add-support-for-dhcpv6.patch b/0075-efinet-and-bootp-add-support-for-dhcpv6.patch
similarity index 97%
rename from 0077-efinet-and-bootp-add-support-for-dhcpv6.patch
rename to 0075-efinet-and-bootp-add-support-for-dhcpv6.patch
index 924bfa33..8c97d2c3 100644
--- a/0077-efinet-and-bootp-add-support-for-dhcpv6.patch
+++ b/0075-efinet-and-bootp-add-support-for-dhcpv6.patch
@@ -6,12 +6,12 @@ Subject: [PATCH] efinet and bootp: add support for dhcpv6
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  grub-core/net/bootp.c              | 174 +++++++++++++++++++++++++++++++++++++
- grub-core/net/drivers/efi/efinet.c |  55 ++++++++++--
+ grub-core/net/drivers/efi/efinet.c |  54 ++++++++++--
  grub-core/net/net.c                |  72 +++++++++++++++
  grub-core/net/tftp.c               |   4 +
  include/grub/efi/api.h             | 129 +++++++++++++++++++++++++--
  include/grub/net.h                 |  60 +++++++++++++
- 6 files changed, 480 insertions(+), 14 deletions(-)
+ 6 files changed, 479 insertions(+), 14 deletions(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
 index f03eeab2fb4..da3e454466b 100644
@@ -206,7 +206,7 @@ index f03eeab2fb4..da3e454466b 100644
  grub_net_process_dhcp (struct grub_net_buff *nb,
  		       struct grub_net_card *card)
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index a3ce4c67cce..329024b6f2c 100644
+index 5388f952ba9..a57189e8bb3 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -18,11 +18,15 @@
@@ -225,7 +225,7 @@ index a3ce4c67cce..329024b6f2c 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -409,7 +413,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -329,7 +333,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  			  char **path)
  {
    struct grub_net_card *card;
@@ -234,16 +234,13 @@ index a3ce4c67cce..329024b6f2c 100644
  
    dp = grub_efi_get_device_path (hnd);
    if (! dp)
-@@ -420,16 +424,22 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -340,14 +344,19 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
      grub_efi_device_path_t *cdp;
      struct grub_efi_pxe *pxe;
      struct grub_efi_pxe_mode *pxe_mode;
 +
      if (card->driver != &efidriver)
        continue;
-+
-     if (hnd != card->efi_handle)
-       continue;
 +
      cdp = grub_efi_get_device_path (card->efi_handle);
      if (! cdp)
@@ -258,7 +255,7 @@ index a3ce4c67cce..329024b6f2c 100644
  	int match;
  
  	/* EDK2 UEFI PXE driver creates pseudo devices with type IPv4/IPv6
-@@ -438,7 +448,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -356,7 +365,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	   devices. We skip them when enumerating cards, so here we need to
  	   find matching MAC device.
           */
@@ -266,7 +263,7 @@ index a3ce4c67cce..329024b6f2c 100644
  	if (GRUB_EFI_DEVICE_PATH_TYPE (ldp) != GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
  	    || (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE
  		&& GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV6_DEVICE_PATH_SUBTYPE))
-@@ -455,16 +464,46 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -373,16 +381,46 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	if (!match)
  	  continue;
        }
@@ -430,7 +427,7 @@ index 7d90bf66e76..1157524fc50 100644
        grub_free (data);
        return grub_errno;
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 97b9aa7a4d7..02488ec35ae 100644
+index c7c9f0e1db1..28b6adf7648 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
 @@ -572,10 +572,16 @@ typedef void *grub_efi_handle_t;
@@ -454,7 +451,7 @@ index 97b9aa7a4d7..02488ec35ae 100644
  typedef grub_efi_uint64_t grub_efi_physical_address_t;
  typedef grub_efi_uint64_t grub_efi_virtual_address_t;
  
-@@ -1454,16 +1460,127 @@ struct grub_efi_simple_text_output_interface
+@@ -1450,16 +1456,127 @@ struct grub_efi_simple_text_output_interface
  };
  typedef struct grub_efi_simple_text_output_interface grub_efi_simple_text_output_interface_t;
  
diff --git a/0078-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0076-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
similarity index 100%
rename from 0078-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
rename to 0076-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
diff --git a/0079-Normalize-slashes-in-tftp-paths.patch b/0077-Normalize-slashes-in-tftp-paths.patch
similarity index 100%
rename from 0079-Normalize-slashes-in-tftp-paths.patch
rename to 0077-Normalize-slashes-in-tftp-paths.patch
diff --git a/0080-Fix-malformed-tftp-packets.patch b/0078-Fix-malformed-tftp-packets.patch
similarity index 100%
rename from 0080-Fix-malformed-tftp-packets.patch
rename to 0078-Fix-malformed-tftp-packets.patch
diff --git a/0081-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0079-bz1374141-fix-incorrect-mask-for-ppc64.patch
similarity index 100%
rename from 0081-bz1374141-fix-incorrect-mask-for-ppc64.patch
rename to 0079-bz1374141-fix-incorrect-mask-for-ppc64.patch
diff --git a/0082-Make-grub_fatal-also-backtrace.patch b/0080-Make-grub_fatal-also-backtrace.patch
similarity index 100%
rename from 0082-Make-grub_fatal-also-backtrace.patch
rename to 0080-Make-grub_fatal-also-backtrace.patch
diff --git a/0083-Make-grub-editenv-build-again.patch b/0081-Make-grub-editenv-build-again.patch
similarity index 100%
rename from 0083-Make-grub-editenv-build-again.patch
rename to 0081-Make-grub-editenv-build-again.patch
diff --git a/0084-Fix-up-some-man-pages-rpmdiff-noticed.patch b/0082-Fix-up-some-man-pages-rpmdiff-noticed.patch
similarity index 100%
rename from 0084-Fix-up-some-man-pages-rpmdiff-noticed.patch
rename to 0082-Fix-up-some-man-pages-rpmdiff-noticed.patch
diff --git a/0085-Make-exit-take-a-return-code.patch b/0083-Make-exit-take-a-return-code.patch
similarity index 100%
rename from 0085-Make-exit-take-a-return-code.patch
rename to 0083-Make-exit-take-a-return-code.patch
diff --git a/0086-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch b/0084-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch
similarity index 100%
rename from 0086-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch
rename to 0084-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch
diff --git a/0087-Make-our-info-pages-say-grub2-where-appropriate.patch b/0085-Make-our-info-pages-say-grub2-where-appropriate.patch
similarity index 100%
rename from 0087-Make-our-info-pages-say-grub2-where-appropriate.patch
rename to 0085-Make-our-info-pages-say-grub2-where-appropriate.patch
diff --git a/0088-print-more-debug-info-in-our-module-loader.patch b/0086-print-more-debug-info-in-our-module-loader.patch
similarity index 100%
rename from 0088-print-more-debug-info-in-our-module-loader.patch
rename to 0086-print-more-debug-info-in-our-module-loader.patch
diff --git a/0089-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/0087-macos-just-build-chainloader-entries-don-t-try-any-x.patch
similarity index 100%
rename from 0089-macos-just-build-chainloader-entries-don-t-try-any-x.patch
rename to 0087-macos-just-build-chainloader-entries-don-t-try-any-x.patch
diff --git a/0090-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/0088-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
similarity index 100%
rename from 0090-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
rename to 0088-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
diff --git a/0091-export-btrfs_subvol-and-btrfs_subvolid.patch b/0089-export-btrfs_subvol-and-btrfs_subvolid.patch
similarity index 100%
rename from 0091-export-btrfs_subvol-and-btrfs_subvolid.patch
rename to 0089-export-btrfs_subvol-and-btrfs_subvolid.patch
diff --git a/0092-grub2-btrfs-03-follow_default.patch b/0090-grub2-btrfs-03-follow_default.patch
similarity index 100%
rename from 0092-grub2-btrfs-03-follow_default.patch
rename to 0090-grub2-btrfs-03-follow_default.patch
diff --git a/0093-grub2-btrfs-04-grub2-install.patch b/0091-grub2-btrfs-04-grub2-install.patch
similarity index 100%
rename from 0093-grub2-btrfs-04-grub2-install.patch
rename to 0091-grub2-btrfs-04-grub2-install.patch
diff --git a/0094-grub2-btrfs-05-grub2-mkconfig.patch b/0092-grub2-btrfs-05-grub2-mkconfig.patch
similarity index 100%
rename from 0094-grub2-btrfs-05-grub2-mkconfig.patch
rename to 0092-grub2-btrfs-05-grub2-mkconfig.patch
diff --git a/0095-grub2-btrfs-06-subvol-mount.patch b/0093-grub2-btrfs-06-subvol-mount.patch
similarity index 100%
rename from 0095-grub2-btrfs-06-subvol-mount.patch
rename to 0093-grub2-btrfs-06-subvol-mount.patch
diff --git a/0096-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch b/0094-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch
similarity index 100%
rename from 0096-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch
rename to 0094-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch
diff --git a/0097-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/0095-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
similarity index 100%
rename from 0097-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
rename to 0095-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
diff --git a/0098-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/0096-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
similarity index 100%
rename from 0098-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
rename to 0096-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
diff --git a/0099-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/0097-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
similarity index 100%
rename from 0099-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
rename to 0097-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
diff --git a/0100-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0098-Use-grub_efi_.-memory-helpers-where-reasonable.patch
similarity index 100%
rename from 0100-Use-grub_efi_.-memory-helpers-where-reasonable.patch
rename to 0098-Use-grub_efi_.-memory-helpers-where-reasonable.patch
diff --git a/0101-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0099-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
similarity index 97%
rename from 0101-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
rename to 0099-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
index c7259543..004fced7 100644
--- a/0101-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
+++ b/0099-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
@@ -26,7 +26,7 @@ index 106eb10a362..3630b0cbf2d 100644
    efi_status = grub_efi_free_pool (buffer);
  
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 02488ec35ae..ddc5ecfb03d 100644
+index 28b6adf7648..e5b521bd9be 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
 @@ -527,6 +527,14 @@ typedef grub_uint8_t grub_efi_char8_t;
diff --git a/0102-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch b/0100-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch
similarity index 100%
rename from 0102-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch
rename to 0100-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch
diff --git a/0103-don-t-ignore-const.patch b/0101-don-t-ignore-const.patch
similarity index 100%
rename from 0103-don-t-ignore-const.patch
rename to 0101-don-t-ignore-const.patch
diff --git a/0104-don-t-use-int-for-efi-status.patch b/0102-don-t-use-int-for-efi-status.patch
similarity index 100%
rename from 0104-don-t-use-int-for-efi-status.patch
rename to 0102-don-t-use-int-for-efi-status.patch
diff --git a/0105-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0103-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
similarity index 100%
rename from 0105-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
rename to 0103-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
diff --git a/0106-editenv-handle-relative-symlinks.patch b/0104-editenv-handle-relative-symlinks.patch
similarity index 100%
rename from 0106-editenv-handle-relative-symlinks.patch
rename to 0104-editenv-handle-relative-symlinks.patch
diff --git a/0107-Make-libgrub.pp-depend-on-config-util.h.patch b/0105-Make-libgrub.pp-depend-on-config-util.h.patch
similarity index 100%
rename from 0107-Make-libgrub.pp-depend-on-config-util.h.patch
rename to 0105-Make-libgrub.pp-depend-on-config-util.h.patch
diff --git a/0108-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/0106-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
similarity index 100%
rename from 0108-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
rename to 0106-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
diff --git a/0109-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch b/0107-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
similarity index 100%
rename from 0109-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
rename to 0107-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
diff --git a/0110-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch b/0108-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
similarity index 100%
rename from 0110-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
rename to 0108-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
diff --git a/0111-align-struct-efi_variable-better.patch b/0109-align-struct-efi_variable-better.patch
similarity index 100%
rename from 0111-align-struct-efi_variable-better.patch
rename to 0109-align-struct-efi_variable-better.patch
diff --git a/0112-Add-quicksort-implementation.patch b/0110-Add-quicksort-implementation.patch
similarity index 100%
rename from 0112-Add-quicksort-implementation.patch
rename to 0110-Add-quicksort-implementation.patch
diff --git a/0113-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch b/0111-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch
similarity index 100%
rename from 0113-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch
rename to 0111-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch
diff --git a/0114-Add-BLS-support-to-grub-mkconfig.patch b/0112-Add-BLS-support-to-grub-mkconfig.patch
similarity index 100%
rename from 0114-Add-BLS-support-to-grub-mkconfig.patch
rename to 0112-Add-BLS-support-to-grub-mkconfig.patch
diff --git a/0115-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch b/0113-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch
similarity index 100%
rename from 0115-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch
rename to 0113-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch
diff --git a/0116-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch b/0114-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
similarity index 100%
rename from 0116-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
rename to 0114-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
diff --git a/0117-Enable-blscfg-command-for-the-emu-platform.patch b/0115-Enable-blscfg-command-for-the-emu-platform.patch
similarity index 100%
rename from 0117-Enable-blscfg-command-for-the-emu-platform.patch
rename to 0115-Enable-blscfg-command-for-the-emu-platform.patch
diff --git a/0118-Add-linux-and-initrd-commands-for-grub-emu.patch b/0116-Add-linux-and-initrd-commands-for-grub-emu.patch
similarity index 100%
rename from 0118-Add-linux-and-initrd-commands-for-grub-emu.patch
rename to 0116-Add-linux-and-initrd-commands-for-grub-emu.patch
diff --git a/0119-Fix-the-efidir-in-grub-setpassword.patch b/0117-Fix-the-efidir-in-grub-setpassword.patch
similarity index 100%
rename from 0119-Fix-the-efidir-in-grub-setpassword.patch
rename to 0117-Fix-the-efidir-in-grub-setpassword.patch
diff --git a/0120-Add-grub2-switch-to-blscfg.patch b/0118-Add-grub2-switch-to-blscfg.patch
similarity index 100%
rename from 0120-Add-grub2-switch-to-blscfg.patch
rename to 0118-Add-grub2-switch-to-blscfg.patch
diff --git a/0121-Add-grub_debug_enabled.patch b/0119-Add-grub_debug_enabled.patch
similarity index 100%
rename from 0121-Add-grub_debug_enabled.patch
rename to 0119-Add-grub_debug_enabled.patch
diff --git a/0122-make-better-backtraces.patch b/0120-make-better-backtraces.patch
similarity index 100%
rename from 0122-make-better-backtraces.patch
rename to 0120-make-better-backtraces.patch
diff --git a/0123-normal-don-t-draw-our-startup-message-if-debug-is-se.patch b/0121-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
similarity index 100%
rename from 0123-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
rename to 0121-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
diff --git a/0124-Work-around-some-minor-include-path-weirdnesses.patch b/0122-Work-around-some-minor-include-path-weirdnesses.patch
similarity index 100%
rename from 0124-Work-around-some-minor-include-path-weirdnesses.patch
rename to 0122-Work-around-some-minor-include-path-weirdnesses.patch
diff --git a/0125-Make-it-possible-to-enabled-build-id-sha1.patch b/0123-Make-it-possible-to-enabled-build-id-sha1.patch
similarity index 100%
rename from 0125-Make-it-possible-to-enabled-build-id-sha1.patch
rename to 0123-Make-it-possible-to-enabled-build-id-sha1.patch
diff --git a/0126-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch b/0124-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
similarity index 100%
rename from 0126-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
rename to 0124-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
diff --git a/0127-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch b/0125-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
similarity index 100%
rename from 0127-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
rename to 0125-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
diff --git a/0128-Only-attempt-to-scan-different-BLS-directories-on-EF.patch b/0126-Only-attempt-to-scan-different-BLS-directories-on-EF.patch
similarity index 100%
rename from 0128-Only-attempt-to-scan-different-BLS-directories-on-EF.patch
rename to 0126-Only-attempt-to-scan-different-BLS-directories-on-EF.patch
diff --git a/0129-Core-TPM-support.patch b/0127-Core-TPM-support.patch
similarity index 100%
rename from 0129-Core-TPM-support.patch
rename to 0127-Core-TPM-support.patch
diff --git a/0130-Measure-kernel-initrd.patch b/0128-Measure-kernel-initrd.patch
similarity index 100%
rename from 0130-Measure-kernel-initrd.patch
rename to 0128-Measure-kernel-initrd.patch
diff --git a/0131-Add-BIOS-boot-measurement.patch b/0129-Add-BIOS-boot-measurement.patch
similarity index 100%
rename from 0131-Add-BIOS-boot-measurement.patch
rename to 0129-Add-BIOS-boot-measurement.patch
diff --git a/0132-Measure-kernel-and-initrd-on-BIOS-systems.patch b/0130-Measure-kernel-and-initrd-on-BIOS-systems.patch
similarity index 100%
rename from 0132-Measure-kernel-and-initrd-on-BIOS-systems.patch
rename to 0130-Measure-kernel-and-initrd-on-BIOS-systems.patch
diff --git a/0133-Measure-the-kernel-commandline.patch b/0131-Measure-the-kernel-commandline.patch
similarity index 100%
rename from 0133-Measure-the-kernel-commandline.patch
rename to 0131-Measure-the-kernel-commandline.patch
diff --git a/0134-Measure-commands.patch b/0132-Measure-commands.patch
similarity index 100%
rename from 0134-Measure-commands.patch
rename to 0132-Measure-commands.patch
diff --git a/0135-Measure-multiboot-images-and-modules.patch b/0133-Measure-multiboot-images-and-modules.patch
similarity index 100%
rename from 0135-Measure-multiboot-images-and-modules.patch
rename to 0133-Measure-multiboot-images-and-modules.patch
diff --git a/0136-Fix-boot-when-there-s-no-TPM.patch b/0134-Fix-boot-when-there-s-no-TPM.patch
similarity index 100%
rename from 0136-Fix-boot-when-there-s-no-TPM.patch
rename to 0134-Fix-boot-when-there-s-no-TPM.patch
diff --git a/0137-Rework-TPM-measurements.patch b/0135-Rework-TPM-measurements.patch
similarity index 100%
rename from 0137-Rework-TPM-measurements.patch
rename to 0135-Rework-TPM-measurements.patch
diff --git a/0138-Fix-event-log-prefix.patch b/0136-Fix-event-log-prefix.patch
similarity index 100%
rename from 0138-Fix-event-log-prefix.patch
rename to 0136-Fix-event-log-prefix.patch
diff --git a/0139-Set-the-first-boot-menu-entry-as-default-when-using-.patch b/0137-Set-the-first-boot-menu-entry-as-default-when-using-.patch
similarity index 100%
rename from 0139-Set-the-first-boot-menu-entry-as-default-when-using-.patch
rename to 0137-Set-the-first-boot-menu-entry-as-default-when-using-.patch
diff --git a/0140-tpm-fix-warnings-when-compiling-for-platforms-other-.patch b/0138-tpm-fix-warnings-when-compiling-for-platforms-other-.patch
similarity index 100%
rename from 0140-tpm-fix-warnings-when-compiling-for-platforms-other-.patch
rename to 0138-tpm-fix-warnings-when-compiling-for-platforms-other-.patch
diff --git a/0141-Make-TPM-errors-less-fatal.patch b/0139-Make-TPM-errors-less-fatal.patch
similarity index 100%
rename from 0141-Make-TPM-errors-less-fatal.patch
rename to 0139-Make-TPM-errors-less-fatal.patch
diff --git a/0142-blscfg-handle-multiple-initramfs-images.patch b/0140-blscfg-handle-multiple-initramfs-images.patch
similarity index 100%
rename from 0142-blscfg-handle-multiple-initramfs-images.patch
rename to 0140-blscfg-handle-multiple-initramfs-images.patch
diff --git a/0143-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch b/0141-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch
similarity index 100%
rename from 0143-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch
rename to 0141-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch
diff --git a/0144-BLS-Use-etcdefaultgrub-instead-of-etc.patch b/0142-BLS-Use-etcdefaultgrub-instead-of-etc.patch
similarity index 100%
rename from 0144-BLS-Use-etcdefaultgrub-instead-of-etc.patch
rename to 0142-BLS-Use-etcdefaultgrub-instead-of-etc.patch
diff --git a/0145-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch b/0143-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch
similarity index 100%
rename from 0145-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch
rename to 0143-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch
diff --git a/0146-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch b/0144-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch
similarity index 100%
rename from 0146-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch
rename to 0144-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch
diff --git a/0147-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch b/0145-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch
similarity index 100%
rename from 0147-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch
rename to 0145-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch
diff --git a/0148-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch b/0146-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch
similarity index 100%
rename from 0148-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch
rename to 0146-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch
diff --git a/0149-Include-OSTree-path-when-searching-kernels-images-if.patch b/0147-Include-OSTree-path-when-searching-kernels-images-if.patch
similarity index 100%
rename from 0149-Include-OSTree-path-when-searching-kernels-images-if.patch
rename to 0147-Include-OSTree-path-when-searching-kernels-images-if.patch
diff --git a/0150-Use-BLS-version-field-to-compare-entries-if-id-field.patch b/0148-Use-BLS-version-field-to-compare-entries-if-id-field.patch
similarity index 100%
rename from 0150-Use-BLS-version-field-to-compare-entries-if-id-field.patch
rename to 0148-Use-BLS-version-field-to-compare-entries-if-id-field.patch
diff --git a/0151-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch b/0149-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch
similarity index 100%
rename from 0151-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch
rename to 0149-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch
diff --git a/0152-Fixup-for-newer-compiler.patch b/0150-Fixup-for-newer-compiler.patch
similarity index 100%
rename from 0152-Fixup-for-newer-compiler.patch
rename to 0150-Fixup-for-newer-compiler.patch
diff --git a/0153-Don-t-attempt-to-export-the-start-and-_start-symbols.patch b/0151-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
similarity index 100%
rename from 0153-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
rename to 0151-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
diff --git a/0154-Simplify-BLS-entry-key-val-pairs-lookup.patch b/0152-Simplify-BLS-entry-key-val-pairs-lookup.patch
similarity index 100%
rename from 0154-Simplify-BLS-entry-key-val-pairs-lookup.patch
rename to 0152-Simplify-BLS-entry-key-val-pairs-lookup.patch
diff --git a/0155-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch b/0153-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch
similarity index 100%
rename from 0155-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch
rename to 0153-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch
diff --git a/0156-Skip-leading-spaces-on-BLS-field-values.patch b/0154-Skip-leading-spaces-on-BLS-field-values.patch
similarity index 100%
rename from 0156-Skip-leading-spaces-on-BLS-field-values.patch
rename to 0154-Skip-leading-spaces-on-BLS-field-values.patch
diff --git a/0157-Fixup-for-newer-compiler.patch b/0155-Fixup-for-newer-compiler.patch
similarity index 100%
rename from 0157-Fixup-for-newer-compiler.patch
rename to 0155-Fixup-for-newer-compiler.patch
diff --git a/0158-TPM-Fix-hash_log_extend_event-function-prototype.patch b/0156-TPM-Fix-hash_log_extend_event-function-prototype.patch
similarity index 100%
rename from 0158-TPM-Fix-hash_log_extend_event-function-prototype.patch
rename to 0156-TPM-Fix-hash_log_extend_event-function-prototype.patch
diff --git a/0159-TPM-Fix-compiler-warnings.patch b/0157-TPM-Fix-compiler-warnings.patch
similarity index 100%
rename from 0159-TPM-Fix-compiler-warnings.patch
rename to 0157-TPM-Fix-compiler-warnings.patch
diff --git a/0160-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch b/0158-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch
similarity index 100%
rename from 0160-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch
rename to 0158-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch
diff --git a/0161-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch b/0159-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch
similarity index 100%
rename from 0161-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch
rename to 0159-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch
diff --git a/0162-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch b/0160-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch
similarity index 100%
rename from 0162-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch
rename to 0160-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch
diff --git a/0163-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch b/0161-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch
similarity index 100%
rename from 0163-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch
rename to 0161-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch
diff --git a/0164-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch b/0162-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch
similarity index 100%
rename from 0164-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch
rename to 0162-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch
diff --git a/0165-Revert-trim-arp-packets-with-abnormal-size.patch b/0163-Revert-trim-arp-packets-with-abnormal-size.patch
similarity index 100%
rename from 0165-Revert-trim-arp-packets-with-abnormal-size.patch
rename to 0163-Revert-trim-arp-packets-with-abnormal-size.patch
diff --git a/0166-Use-xid-to-match-DHCP-replies.patch b/0164-Use-xid-to-match-DHCP-replies.patch
similarity index 100%
rename from 0166-Use-xid-to-match-DHCP-replies.patch
rename to 0164-Use-xid-to-match-DHCP-replies.patch
diff --git a/0167-Add-support-for-non-Ethernet-network-cards.patch b/0165-Add-support-for-non-Ethernet-network-cards.patch
similarity index 99%
rename from 0167-Add-support-for-non-Ethernet-network-cards.patch
rename to 0165-Add-support-for-non-Ethernet-network-cards.patch
index e61bcc11..9a83fe69 100644
--- a/0167-Add-support-for-non-Ethernet-network-cards.patch
+++ b/0165-Add-support-for-non-Ethernet-network-cards.patch
@@ -318,10 +318,10 @@ index 2869482fe06..4e55adc557b 100644
  	  grub_netbuff_push (nb, sizeof (*udph));
  
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 329024b6f2c..bf36b446dc4 100644
+index a57189e8bb3..4444e8e60ee 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
-@@ -329,6 +329,9 @@ grub_efinet_find_snp_cards (int preferred_only, grub_efi_handle_t preferred,
+@@ -280,6 +280,9 @@ grub_efinet_findcards (void)
  	/* This should not happen... Why?  */
  	continue;
  
@@ -331,8 +331,8 @@ index 329024b6f2c..bf36b446dc4 100644
        if (net->mode->state == GRUB_EFI_NETWORK_STOPPED
  	  && efi_call_1 (net->start, net) != GRUB_EFI_SUCCESS)
  	continue;
-@@ -366,10 +369,11 @@ grub_efinet_find_snp_cards (int preferred_only, grub_efi_handle_t preferred,
-       *i = (*i)+1;
+@@ -316,10 +319,11 @@ grub_efinet_findcards (void)
+       card->name = grub_xasprintf ("efinet%d", i++);
        card->driver = &efidriver;
        card->flags = 0;
 -      card->default_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
diff --git a/0168-misc-fix-invalid-character-recongition-in-strto-l.patch b/0166-misc-fix-invalid-character-recongition-in-strto-l.patch
similarity index 100%
rename from 0168-misc-fix-invalid-character-recongition-in-strto-l.patch
rename to 0166-misc-fix-invalid-character-recongition-in-strto-l.patch
diff --git a/0169-net-read-bracketed-ipv6-addrs-and-port-numbers.patch b/0167-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
similarity index 100%
rename from 0169-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
rename to 0167-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
diff --git a/0170-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch b/0168-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch
similarity index 100%
rename from 0170-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch
rename to 0168-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch
diff --git a/0171-bootp-New-net_bootp6-command.patch b/0169-bootp-New-net_bootp6-command.patch
similarity index 99%
rename from 0171-bootp-New-net_bootp6-command.patch
rename to 0169-bootp-New-net_bootp6-command.patch
index 684f540f..04a4dccf 100644
--- a/0171-bootp-New-net_bootp6-command.patch
+++ b/0169-bootp-New-net_bootp6-command.patch
@@ -1125,10 +1125,10 @@ index 4e55adc557b..ff1d7776e7f 100644
 +  grub_unregister_command (cmd_bootp6);
  }
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index bf36b446dc4..da90f0f40ce 100644
+index 4444e8e60ee..00d7d37b8de 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
-@@ -477,9 +477,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -394,9 +394,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
      pxe_mode = pxe->mode;
      if (pxe_mode->using_ipv6)
        {
@@ -1138,7 +1138,7 @@ index bf36b446dc4..da90f0f40ce 100644
  	grub_dprintf ("efinet", "using ipv6 and dhcpv6\n");
  	grub_dprintf ("efinet", "dhcp_ack_received: %s%s\n",
  		      pxe_mode->dhcp_ack_received ? "yes" : "no",
-@@ -487,15 +484,14 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -404,15 +401,14 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	if (!pxe_mode->dhcp_ack_received)
  	  continue;
  
@@ -1213,10 +1213,10 @@ index b2ca74b6eb1..9a4e589aa39 100644
        {
  	const struct grub_net_bootp_packet *bootp;
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index ddc5ecfb03d..6a545cc6d5d 100644
+index e5b521bd9be..1250d493e25 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -1511,7 +1511,7 @@ typedef struct grub_efi_pxe_ip_filter
+@@ -1507,7 +1507,7 @@ typedef struct grub_efi_pxe_ip_filter
  {
    grub_efi_uint8_t filters;
    grub_efi_uint8_t ip_count;
diff --git a/0172-Put-back-our-code-to-add-a-local-route.patch b/0170-Put-back-our-code-to-add-a-local-route.patch
similarity index 100%
rename from 0172-Put-back-our-code-to-add-a-local-route.patch
rename to 0170-Put-back-our-code-to-add-a-local-route.patch
diff --git a/0173-efinet-UEFI-IPv6-PXE-support.patch b/0171-efinet-UEFI-IPv6-PXE-support.patch
similarity index 92%
rename from 0173-efinet-UEFI-IPv6-PXE-support.patch
rename to 0171-efinet-UEFI-IPv6-PXE-support.patch
index 98995530..0c387824 100644
--- a/0173-efinet-UEFI-IPv6-PXE-support.patch
+++ b/0171-efinet-UEFI-IPv6-PXE-support.patch
@@ -15,10 +15,10 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
  2 files changed, 46 insertions(+), 27 deletions(-)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index da90f0f40ce..ac58e3e82cf 100644
+index 00d7d37b8de..c3db3285b97 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
-@@ -493,6 +493,8 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -410,6 +410,8 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	  grub_print_error ();
  	if (device && path)
  	  grub_dprintf ("efinet", "device: `%s' path: `%s'\n", *device, *path);
@@ -28,10 +28,10 @@ index da90f0f40ce..ac58e3e82cf 100644
      else
        {
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 6a545cc6d5d..7dbd8807b80 100644
+index 1250d493e25..2f164d4209c 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -1503,31 +1503,6 @@ typedef union
+@@ -1499,31 +1499,6 @@ typedef union
    grub_efi_pxe_dhcpv6_packet_t dhcpv6;
  } grub_efi_pxe_packet_t;
  
@@ -63,7 +63,7 @@ index 6a545cc6d5d..7dbd8807b80 100644
  typedef struct grub_efi_pxe_icmp_error
  {
    grub_efi_uint8_t type;
-@@ -1553,6 +1528,48 @@ typedef struct grub_efi_pxe_tftp_error
+@@ -1549,6 +1524,48 @@ typedef struct grub_efi_pxe_tftp_error
    grub_efi_char8_t error_string[127];
  } grub_efi_pxe_tftp_error_t;
  
@@ -112,7 +112,7 @@ index 6a545cc6d5d..7dbd8807b80 100644
  typedef struct grub_efi_pxe_mode
  {
    grub_efi_boolean_t started;
-@@ -1584,9 +1601,9 @@ typedef struct grub_efi_pxe_mode
+@@ -1580,9 +1597,9 @@ typedef struct grub_efi_pxe_mode
    grub_efi_pxe_packet_t pxe_bis_reply;
    grub_efi_pxe_ip_filter_t ip_filter;
    grub_efi_uint32_t arp_cache_entries;
diff --git a/0174-grub.texi-Add-net_bootp6-doument.patch b/0172-grub.texi-Add-net_bootp6-doument.patch
similarity index 100%
rename from 0174-grub.texi-Add-net_bootp6-doument.patch
rename to 0172-grub.texi-Add-net_bootp6-doument.patch
diff --git a/0175-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch b/0173-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
similarity index 100%
rename from 0175-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
rename to 0173-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
diff --git a/0176-efinet-Setting-network-from-UEFI-device-path.patch b/0174-efinet-Setting-network-from-UEFI-device-path.patch
similarity index 95%
rename from 0176-efinet-Setting-network-from-UEFI-device-path.patch
rename to 0174-efinet-Setting-network-from-UEFI-device-path.patch
index 6f978865..120f2e9a 100644
--- a/0176-efinet-Setting-network-from-UEFI-device-path.patch
+++ b/0174-efinet-Setting-network-from-UEFI-device-path.patch
@@ -32,7 +32,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
  2 files changed, 280 insertions(+), 15 deletions(-)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index ac58e3e82cf..431b72916b6 100644
+index c3db3285b97..2817b6f8fb9 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -27,6 +27,7 @@
@@ -43,8 +43,8 @@ index ac58e3e82cf..431b72916b6 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -412,6 +413,227 @@ grub_efinet_findcards (void)
-     }
+@@ -332,6 +333,227 @@ grub_efinet_findcards (void)
+   grub_free (handles);
  }
  
 +static struct grub_net_buff *
@@ -271,7 +271,7 @@ index ac58e3e82cf..431b72916b6 100644
  static void
  grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  			  char **path)
-@@ -427,7 +649,11 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -347,7 +569,11 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
    {
      grub_efi_device_path_t *cdp;
      struct grub_efi_pxe *pxe;
@@ -284,7 +284,7 @@ index ac58e3e82cf..431b72916b6 100644
  
      if (card->driver != &efidriver)
        continue;
-@@ -454,11 +680,21 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -371,11 +597,21 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
           */
  	if (GRUB_EFI_DEVICE_PATH_TYPE (ldp) != GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
  	    || (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE
@@ -307,7 +307,7 @@ index ac58e3e82cf..431b72916b6 100644
  	dup_ldp = grub_efi_find_last_device_path (dup_dp);
  	dup_ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
  	dup_ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
-@@ -471,23 +707,37 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -388,23 +624,37 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  
      pxe = grub_efi_open_protocol (hnd, &pxe_io_guid,
  				  GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
@@ -356,7 +356,7 @@ index ac58e3e82cf..431b72916b6 100644
  					    1, device, path);
  	if (grub_errno)
  	  grub_print_error ();
-@@ -501,11 +751,15 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -418,11 +668,15 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	grub_dprintf ("efinet", "using ipv4 and dhcp\n");
  	grub_net_configure_by_dhcp_ack (card->name, card, 0,
  					(struct grub_net_bootp_packet *)
@@ -375,10 +375,10 @@ index ac58e3e82cf..431b72916b6 100644
    }
  }
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 7dbd8807b80..0b61f791850 100644
+index 2f164d4209c..eb6bb50857c 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -843,6 +843,8 @@ struct grub_efi_ipv4_device_path
+@@ -839,6 +839,8 @@ struct grub_efi_ipv4_device_path
    grub_efi_uint16_t remote_port;
    grub_efi_uint16_t protocol;
    grub_efi_uint8_t static_ip_address;
@@ -387,7 +387,7 @@ index 7dbd8807b80..0b61f791850 100644
  } GRUB_PACKED;
  typedef struct grub_efi_ipv4_device_path grub_efi_ipv4_device_path_t;
  
-@@ -897,6 +899,15 @@ struct grub_efi_sata_device_path
+@@ -893,6 +895,15 @@ struct grub_efi_sata_device_path
  } GRUB_PACKED;
  typedef struct grub_efi_sata_device_path grub_efi_sata_device_path_t;
  
diff --git a/0177-efinet-Setting-DNS-server-from-UEFI-protocol.patch b/0175-efinet-Setting-DNS-server-from-UEFI-protocol.patch
similarity index 95%
rename from 0177-efinet-Setting-DNS-server-from-UEFI-protocol.patch
rename to 0175-efinet-Setting-DNS-server-from-UEFI-protocol.patch
index 11f9f688..b1859376 100644
--- a/0177-efinet-Setting-DNS-server-from-UEFI-protocol.patch
+++ b/0175-efinet-Setting-DNS-server-from-UEFI-protocol.patch
@@ -33,7 +33,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
  2 files changed, 239 insertions(+)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 431b72916b6..c25a68161b8 100644
+index 2817b6f8fb9..c843654b830 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -34,6 +34,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
@@ -45,8 +45,8 @@ index 431b72916b6..c25a68161b8 100644
  
  static grub_err_t
  send_card_buffer (struct grub_net_card *dev,
-@@ -413,6 +415,125 @@ grub_efinet_findcards (void)
-     }
+@@ -333,6 +335,125 @@ grub_efinet_findcards (void)
+   grub_free (handles);
  }
  
 +static grub_efi_handle_t
@@ -171,7 +171,7 @@ index 431b72916b6..c25a68161b8 100644
  static struct grub_net_buff *
  grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *use_ipv6)
  {
-@@ -471,6 +592,8 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
+@@ -391,6 +512,8 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
        grub_efi_ipv4_device_path_t *ipv4 = (grub_efi_ipv4_device_path_t *) ldp;
        struct grub_net_bootp_packet *bp;
        grub_uint8_t *ptr;
@@ -180,7 +180,7 @@ index 431b72916b6..c25a68161b8 100644
  
        bp = (struct grub_net_bootp_packet *) nb->tail;
        err = grub_netbuff_put (nb, sizeof (*bp) + 4);
-@@ -532,6 +655,25 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
+@@ -452,6 +575,25 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
        *ptr++ = sizeof ("HTTPClient") - 1;
        grub_memcpy (ptr, "HTTPClient", sizeof ("HTTPClient") - 1);
  
@@ -206,7 +206,7 @@ index 431b72916b6..c25a68161b8 100644
        ptr = nb->tail;
        err = grub_netbuff_put (nb, 1);
        if (err)
-@@ -564,6 +706,8 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
+@@ -484,6 +626,8 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
        struct grub_net_dhcp6_option *opt;
        struct grub_net_dhcp6_option_iana *iana;
        struct grub_net_dhcp6_option_iaaddr *iaaddr;
@@ -215,7 +215,7 @@ index 431b72916b6..c25a68161b8 100644
  
        d6p = (struct grub_net_dhcp6_packet *)nb->tail;
        err = grub_netbuff_put (nb, sizeof(*d6p));
-@@ -627,6 +771,25 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
+@@ -547,6 +691,25 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
        opt->len = grub_cpu_to_be16 (uri_len);
        grub_memcpy (opt->data, uri_dp->uri, uri_len);
  
@@ -242,7 +242,7 @@ index 431b72916b6..c25a68161b8 100644
      }
  
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 0b61f791850..80f6d79cfaf 100644
+index eb6bb50857c..dd3b07eac97 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
 @@ -334,6 +334,16 @@
@@ -262,7 +262,7 @@ index 0b61f791850..80f6d79cfaf 100644
  struct grub_efi_sal_system_table
  {
    grub_uint32_t signature;
-@@ -1842,6 +1852,72 @@ struct grub_efi_block_io
+@@ -1838,6 +1848,72 @@ struct grub_efi_block_io
  };
  typedef struct grub_efi_block_io grub_efi_block_io_t;
  
diff --git a/0178-Fix-one-more-coverity-complaint.patch b/0176-Fix-one-more-coverity-complaint.patch
similarity index 100%
rename from 0178-Fix-one-more-coverity-complaint.patch
rename to 0176-Fix-one-more-coverity-complaint.patch
diff --git a/0179-Fix-grub_net_hwaddr_to_str.patch b/0177-Fix-grub_net_hwaddr_to_str.patch
similarity index 100%
rename from 0179-Fix-grub_net_hwaddr_to_str.patch
rename to 0177-Fix-grub_net_hwaddr_to_str.patch
diff --git a/0180-Support-UEFI-networking-protocols.patch b/0178-Support-UEFI-networking-protocols.patch
similarity index 99%
rename from 0180-Support-UEFI-networking-protocols.patch
rename to 0178-Support-UEFI-networking-protocols.patch
index 20728f9f..69738549 100644
--- a/0180-Support-UEFI-networking-protocols.patch
+++ b/0178-Support-UEFI-networking-protocols.patch
@@ -233,7 +233,7 @@ index a2a732ffc0d..4d36fe31177 100644
  	      grub_printf ("/UnknownMessaging(%x)", (unsigned) subtype);
  	      break;
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index c25a68161b8..56305f46a3d 100644
+index c843654b830..ca8bd3c2301 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -28,6 +28,7 @@
@@ -244,7 +244,7 @@ index c25a68161b8..56305f46a3d 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -572,6 +573,17 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
+@@ -492,6 +493,17 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
  
    ldp = grub_efi_find_last_device_path (ddp);
  
@@ -262,7 +262,7 @@ index c25a68161b8..56305f46a3d 100644
    if (GRUB_EFI_DEVICE_PATH_TYPE (ldp) != GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
        || (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE
            && GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV6_DEVICE_PATH_SUBTYPE))
-@@ -844,6 +856,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -761,6 +773,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	if (GRUB_EFI_DEVICE_PATH_TYPE (ldp) != GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
  	    || (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE
  		&& GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV6_DEVICE_PATH_SUBTYPE
@@ -270,7 +270,7 @@ index c25a68161b8..56305f46a3d 100644
  		&& GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_URI_DEVICE_PATH_SUBTYPE))
  	  continue;
  	dup_dp = grub_efi_duplicate_device_path (dp);
-@@ -858,6 +871,15 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -775,6 +788,15 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	    dup_ldp->length = sizeof (*dup_ldp);
  	  }
  
@@ -286,7 +286,7 @@ index c25a68161b8..56305f46a3d 100644
  	dup_ldp = grub_efi_find_last_device_path (dup_dp);
  	dup_ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
  	dup_ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
-@@ -929,6 +951,9 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -846,6 +868,9 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  
  GRUB_MOD_INIT(efinet)
  {
@@ -296,7 +296,7 @@ index c25a68161b8..56305f46a3d 100644
    grub_efinet_findcards ();
    grub_efi_net_config = grub_efi_net_config_real;
  }
-@@ -940,5 +965,7 @@ GRUB_MOD_FINI(efinet)
+@@ -857,5 +882,7 @@ GRUB_MOD_FINI(efinet)
    FOR_NET_CARDS_SAFE (card, next) 
      if (card->driver == &efidriver)
        grub_net_card_unregister (card);
@@ -4084,7 +4084,7 @@ index 82073d5cc94..ae31271bbc0 100644
    if (!grub_install_source_directory)
      {
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 80f6d79cfaf..5f62a2d4292 100644
+index dd3b07eac97..b337e1a193d 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
 @@ -602,6 +602,23 @@ typedef union
@@ -4111,7 +4111,7 @@ index 80f6d79cfaf..5f62a2d4292 100644
  
  struct grub_efi_guid
  {
-@@ -869,6 +886,8 @@ struct grub_efi_ipv6_device_path
+@@ -865,6 +882,8 @@ struct grub_efi_ipv6_device_path
    grub_efi_uint16_t remote_port;
    grub_efi_uint16_t protocol;
    grub_efi_uint8_t static_ip_address;
@@ -4120,7 +4120,7 @@ index 80f6d79cfaf..5f62a2d4292 100644
  } GRUB_PACKED;
  typedef struct grub_efi_ipv6_device_path grub_efi_ipv6_device_path_t;
  
-@@ -918,6 +937,15 @@ struct grub_efi_uri_device_path
+@@ -914,6 +933,15 @@ struct grub_efi_uri_device_path
  } GRUB_PACKED;
  typedef struct grub_efi_uri_device_path grub_efi_uri_device_path_t;
  
@@ -4136,7 +4136,7 @@ index 80f6d79cfaf..5f62a2d4292 100644
  #define GRUB_EFI_VENDOR_MESSAGING_DEVICE_PATH_SUBTYPE	10
  
  /* Media Device Path.  */
-@@ -1000,6 +1028,23 @@ struct grub_efi_bios_device_path
+@@ -996,6 +1024,23 @@ struct grub_efi_bios_device_path
  } GRUB_PACKED;
  typedef struct grub_efi_bios_device_path grub_efi_bios_device_path_t;
  
@@ -4160,7 +4160,7 @@ index 80f6d79cfaf..5f62a2d4292 100644
  struct grub_efi_open_protocol_information_entry
  {
    grub_efi_handle_t agent_handle;
-@@ -1549,23 +1594,27 @@ typedef struct grub_efi_pxe_tftp_error
+@@ -1545,23 +1590,27 @@ typedef struct grub_efi_pxe_tftp_error
    grub_efi_char8_t error_string[127];
  } grub_efi_pxe_tftp_error_t;
  
@@ -4202,7 +4202,7 @@ index 80f6d79cfaf..5f62a2d4292 100644
  
  #define GRUB_EFI_PXE_BASE_CODE_MAX_IPCNT 8
  typedef struct grub_efi_pxe_ip_filter
-@@ -1632,17 +1681,31 @@ typedef struct grub_efi_pxe_mode
+@@ -1628,17 +1677,31 @@ typedef struct grub_efi_pxe_mode
  typedef struct grub_efi_pxe
  {
    grub_uint64_t rev;
@@ -4238,7 +4238,7 @@ index 80f6d79cfaf..5f62a2d4292 100644
    void (*setpackets) (void);
    struct grub_efi_pxe_mode *mode;
  } grub_efi_pxe_t;
-@@ -1884,6 +1947,44 @@ struct grub_efi_ip4_config2_protocol
+@@ -1880,6 +1943,44 @@ struct grub_efi_ip4_config2_protocol
  };
  typedef struct grub_efi_ip4_config2_protocol grub_efi_ip4_config2_protocol_t;
  
@@ -4283,7 +4283,7 @@ index 80f6d79cfaf..5f62a2d4292 100644
  enum grub_efi_ip6_config_data_type {
    GRUB_EFI_IP6_CONFIG_DATA_TYPE_INTERFACEINFO,
    GRUB_EFI_IP6_CONFIG_DATA_TYPE_ALT_INTERFACEID,
-@@ -1918,6 +2019,49 @@ struct grub_efi_ip6_config_protocol
+@@ -1914,6 +2015,49 @@ struct grub_efi_ip6_config_protocol
  };
  typedef struct grub_efi_ip6_config_protocol grub_efi_ip6_config_protocol_t;
  
diff --git a/0181-AUDIT-0-http-boot-tracker-bug.patch b/0179-AUDIT-0-http-boot-tracker-bug.patch
similarity index 100%
rename from 0181-AUDIT-0-http-boot-tracker-bug.patch
rename to 0179-AUDIT-0-http-boot-tracker-bug.patch
diff --git a/0182-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch b/0180-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch
similarity index 100%
rename from 0182-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch
rename to 0180-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch
diff --git a/0183-efi-uga-use-64-bit-for-fb_base.patch b/0181-efi-uga-use-64-bit-for-fb_base.patch
similarity index 100%
rename from 0183-efi-uga-use-64-bit-for-fb_base.patch
rename to 0181-efi-uga-use-64-bit-for-fb_base.patch
diff --git a/0184-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch b/0182-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch
similarity index 100%
rename from 0184-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch
rename to 0182-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch
diff --git a/0185-EFI-console-Add-grub_console_read_key_stroke-helper-.patch b/0183-EFI-console-Add-grub_console_read_key_stroke-helper-.patch
similarity index 100%
rename from 0185-EFI-console-Add-grub_console_read_key_stroke-helper-.patch
rename to 0183-EFI-console-Add-grub_console_read_key_stroke-helper-.patch
diff --git a/0186-EFI-console-Implement-getkeystatus-support.patch b/0184-EFI-console-Implement-getkeystatus-support.patch
similarity index 100%
rename from 0186-EFI-console-Implement-getkeystatus-support.patch
rename to 0184-EFI-console-Implement-getkeystatus-support.patch
diff --git a/0187-Make-grub_getkeystatus-helper-funtion-available-ever.patch b/0185-Make-grub_getkeystatus-helper-funtion-available-ever.patch
similarity index 100%
rename from 0187-Make-grub_getkeystatus-helper-funtion-available-ever.patch
rename to 0185-Make-grub_getkeystatus-helper-funtion-available-ever.patch
diff --git a/0188-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch b/0186-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch
similarity index 100%
rename from 0188-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch
rename to 0186-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch
diff --git a/0189-grub-editenv-Add-incr-command-to-increment-integer-v.patch b/0187-grub-editenv-Add-incr-command-to-increment-integer-v.patch
similarity index 100%
rename from 0189-grub-editenv-Add-incr-command-to-increment-integer-v.patch
rename to 0187-grub-editenv-Add-incr-command-to-increment-integer-v.patch
diff --git a/0190-Add-auto-hide-menu-support.patch b/0188-Add-auto-hide-menu-support.patch
similarity index 100%
rename from 0190-Add-auto-hide-menu-support.patch
rename to 0188-Add-auto-hide-menu-support.patch
diff --git a/0191-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch b/0189-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch
similarity index 100%
rename from 0191-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch
rename to 0189-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch
diff --git a/0192-Add-grub-set-bootflag-utility.patch b/0190-Add-grub-set-bootflag-utility.patch
similarity index 100%
rename from 0192-Add-grub-set-bootflag-utility.patch
rename to 0190-Add-grub-set-bootflag-utility.patch
diff --git a/0193-Fix-grub-setpassword-o-s-output-path.patch b/0191-Fix-grub-setpassword-o-s-output-path.patch
similarity index 100%
rename from 0193-Fix-grub-setpassword-o-s-output-path.patch
rename to 0191-Fix-grub-setpassword-o-s-output-path.patch
diff --git a/0194-Make-grub-set-password-be-named-like-all-the-other-g.patch b/0192-Make-grub-set-password-be-named-like-all-the-other-g.patch
similarity index 100%
rename from 0194-Make-grub-set-password-be-named-like-all-the-other-g.patch
rename to 0192-Make-grub-set-password-be-named-like-all-the-other-g.patch
diff --git a/0195-docs-Add-grub-boot-indeterminate.service-example.patch b/0193-docs-Add-grub-boot-indeterminate.service-example.patch
similarity index 100%
rename from 0195-docs-Add-grub-boot-indeterminate.service-example.patch
rename to 0193-docs-Add-grub-boot-indeterminate.service-example.patch
diff --git a/0196-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch b/0194-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch
similarity index 100%
rename from 0196-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch
rename to 0194-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch
diff --git a/0197-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch b/0195-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch
similarity index 100%
rename from 0197-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch
rename to 0195-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch
diff --git a/0198-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch b/0196-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch
similarity index 100%
rename from 0198-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch
rename to 0196-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch
diff --git a/0199-gentpl-add-disable-support.patch b/0197-gentpl-add-disable-support.patch
similarity index 100%
rename from 0199-gentpl-add-disable-support.patch
rename to 0197-gentpl-add-disable-support.patch
diff --git a/0200-gentpl-add-pc-firmware-type.patch b/0198-gentpl-add-pc-firmware-type.patch
similarity index 100%
rename from 0200-gentpl-add-pc-firmware-type.patch
rename to 0198-gentpl-add-pc-firmware-type.patch
diff --git a/0201-blscfg-remove-unused-typedef.patch b/0199-blscfg-remove-unused-typedef.patch
similarity index 100%
rename from 0201-blscfg-remove-unused-typedef.patch
rename to 0199-blscfg-remove-unused-typedef.patch
diff --git a/0202-blscfg-don-t-dynamically-allocate-default_blsdir.patch b/0200-blscfg-don-t-dynamically-allocate-default_blsdir.patch
similarity index 100%
rename from 0202-blscfg-don-t-dynamically-allocate-default_blsdir.patch
rename to 0200-blscfg-don-t-dynamically-allocate-default_blsdir.patch
diff --git a/0203-blscfg-sort-BLS-entries-by-version-field.patch b/0201-blscfg-sort-BLS-entries-by-version-field.patch
similarity index 100%
rename from 0203-blscfg-sort-BLS-entries-by-version-field.patch
rename to 0201-blscfg-sort-BLS-entries-by-version-field.patch
diff --git a/0204-blscfg-remove-NULL-guards-around-grub_free.patch b/0202-blscfg-remove-NULL-guards-around-grub_free.patch
similarity index 100%
rename from 0204-blscfg-remove-NULL-guards-around-grub_free.patch
rename to 0202-blscfg-remove-NULL-guards-around-grub_free.patch
diff --git a/0205-blscfg-fix-filename-in-no-linux-key-error.patch b/0203-blscfg-fix-filename-in-no-linux-key-error.patch
similarity index 100%
rename from 0205-blscfg-fix-filename-in-no-linux-key-error.patch
rename to 0203-blscfg-fix-filename-in-no-linux-key-error.patch
diff --git a/0206-blscfg-don-t-leak-bls_entry.filename.patch b/0204-blscfg-don-t-leak-bls_entry.filename.patch
similarity index 100%
rename from 0206-blscfg-don-t-leak-bls_entry.filename.patch
rename to 0204-blscfg-don-t-leak-bls_entry.filename.patch
diff --git a/0207-blscfg-fix-compilation-on-EFI-and-EMU.patch b/0205-blscfg-fix-compilation-on-EFI-and-EMU.patch
similarity index 100%
rename from 0207-blscfg-fix-compilation-on-EFI-and-EMU.patch
rename to 0205-blscfg-fix-compilation-on-EFI-and-EMU.patch
diff --git a/0208-Add-loadenv-to-blscfg-and-loadenv-source-file-list.patch b/0206-Add-loadenv-to-blscfg-and-loadenv-source-file-list.patch
similarity index 100%
rename from 0208-Add-loadenv-to-blscfg-and-loadenv-source-file-list.patch
rename to 0206-Add-loadenv-to-blscfg-and-loadenv-source-file-list.patch
diff --git a/0209-blscfg-Get-rid-of-the-linuxefi-linux16-linux-distinc.patch b/0207-blscfg-Get-rid-of-the-linuxefi-linux16-linux-distinc.patch
similarity index 100%
rename from 0209-blscfg-Get-rid-of-the-linuxefi-linux16-linux-distinc.patch
rename to 0207-blscfg-Get-rid-of-the-linuxefi-linux16-linux-distinc.patch
diff --git a/0210-grub-switch-to-blscfg-Only-fix-boot-prefix-for-non-g.patch b/0208-grub-switch-to-blscfg-Only-fix-boot-prefix-for-non-g.patch
similarity index 100%
rename from 0210-grub-switch-to-blscfg-Only-fix-boot-prefix-for-non-g.patch
rename to 0208-grub-switch-to-blscfg-Only-fix-boot-prefix-for-non-g.patch
diff --git a/0211-blscfg-Expand-the-BLS-options-field-instead-of-showi.patch b/0209-blscfg-Expand-the-BLS-options-field-instead-of-showi.patch
similarity index 100%
rename from 0211-blscfg-Expand-the-BLS-options-field-instead-of-showi.patch
rename to 0209-blscfg-Expand-the-BLS-options-field-instead-of-showi.patch
diff --git a/0212-blscfg-Fallback-to-search-BLS-snippets-in-boot-loade.patch b/0210-blscfg-Fallback-to-search-BLS-snippets-in-boot-loade.patch
similarity index 100%
rename from 0212-blscfg-Fallback-to-search-BLS-snippets-in-boot-loade.patch
rename to 0210-blscfg-Fallback-to-search-BLS-snippets-in-boot-loade.patch
diff --git a/0213-blscfg-Don-t-attempt-to-sort-by-version-if-not-prese.patch b/0211-blscfg-Don-t-attempt-to-sort-by-version-if-not-prese.patch
similarity index 100%
rename from 0213-blscfg-Don-t-attempt-to-sort-by-version-if-not-prese.patch
rename to 0211-blscfg-Don-t-attempt-to-sort-by-version-if-not-prese.patch
diff --git a/0214-blscfg-remove-logic-to-read-the-grubenv-file-and-set.patch b/0212-blscfg-remove-logic-to-read-the-grubenv-file-and-set.patch
similarity index 100%
rename from 0214-blscfg-remove-logic-to-read-the-grubenv-file-and-set.patch
rename to 0212-blscfg-remove-logic-to-read-the-grubenv-file-and-set.patch
diff --git a/0215-Rename-00_menu_auto_hide.in-to-01_menu_auto_hide.in.patch b/0213-Rename-00_menu_auto_hide.in-to-01_menu_auto_hide.in.patch
similarity index 100%
rename from 0215-Rename-00_menu_auto_hide.in-to-01_menu_auto_hide.in.patch
rename to 0213-Rename-00_menu_auto_hide.in-to-01_menu_auto_hide.in.patch
diff --git a/0216-efinet-also-use-the-firmware-acceleration-for-http.patch b/0214-efinet-also-use-the-firmware-acceleration-for-http.patch
similarity index 100%
rename from 0216-efinet-also-use-the-firmware-acceleration-for-http.patch
rename to 0214-efinet-also-use-the-firmware-acceleration-for-http.patch
diff --git a/0217-efi-http-Make-root_url-reflect-the-protocol-hostname.patch b/0215-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
similarity index 100%
rename from 0217-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
rename to 0215-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
diff --git a/0218-Disable-multiboot-multiboot2-and-linux16-modules-on-.patch b/0216-Disable-multiboot-multiboot2-and-linux16-modules-on-.patch
similarity index 100%
rename from 0218-Disable-multiboot-multiboot2-and-linux16-modules-on-.patch
rename to 0216-Disable-multiboot-multiboot2-and-linux16-modules-on-.patch
diff --git a/0219-Force-everything-to-use-python3.patch b/0217-Force-everything-to-use-python3.patch
similarity index 100%
rename from 0219-Force-everything-to-use-python3.patch
rename to 0217-Force-everything-to-use-python3.patch
diff --git a/0220-Fix-an-8-year-old-typo.patch b/0218-Fix-an-8-year-old-typo.patch
similarity index 100%
rename from 0220-Fix-an-8-year-old-typo.patch
rename to 0218-Fix-an-8-year-old-typo.patch
diff --git a/0221-autogen-don-t-run-autoreconf-in-the-topdir.patch b/0219-autogen-don-t-run-autoreconf-in-the-topdir.patch
similarity index 100%
rename from 0221-autogen-don-t-run-autoreconf-in-the-topdir.patch
rename to 0219-autogen-don-t-run-autoreconf-in-the-topdir.patch
diff --git a/0222-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch b/0220-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
similarity index 100%
rename from 0222-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
rename to 0220-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
diff --git a/0223-module-verifier-make-it-possible-to-run-checkers-on-.patch b/0221-module-verifier-make-it-possible-to-run-checkers-on-.patch
similarity index 100%
rename from 0223-module-verifier-make-it-possible-to-run-checkers-on-.patch
rename to 0221-module-verifier-make-it-possible-to-run-checkers-on-.patch
diff --git a/0224-grub-module-verifier-report-the-filename-or-modname-.patch b/0222-grub-module-verifier-report-the-filename-or-modname-.patch
similarity index 100%
rename from 0224-grub-module-verifier-report-the-filename-or-modname-.patch
rename to 0222-grub-module-verifier-report-the-filename-or-modname-.patch
diff --git a/0225-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch b/0223-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch
similarity index 100%
rename from 0225-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch
rename to 0223-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch
diff --git a/0226-Rework-how-the-fdt-command-builds.patch b/0224-Rework-how-the-fdt-command-builds.patch
similarity index 100%
rename from 0226-Rework-how-the-fdt-command-builds.patch
rename to 0224-Rework-how-the-fdt-command-builds.patch
diff --git a/0227-Disable-non-wordsize-allocations-on-arm.patch b/0225-Disable-non-wordsize-allocations-on-arm.patch
similarity index 100%
rename from 0227-Disable-non-wordsize-allocations-on-arm.patch
rename to 0225-Disable-non-wordsize-allocations-on-arm.patch
diff --git a/0228-strip-R-.note.gnu.property-at-more-places.patch b/0226-strip-R-.note.gnu.property-at-more-places.patch
similarity index 100%
rename from 0228-strip-R-.note.gnu.property-at-more-places.patch
rename to 0226-strip-R-.note.gnu.property-at-more-places.patch
diff --git a/0229-Prepend-prefix-when-HTTP-path-is-relative.patch b/0227-Prepend-prefix-when-HTTP-path-is-relative.patch
similarity index 100%
rename from 0229-Prepend-prefix-when-HTTP-path-is-relative.patch
rename to 0227-Prepend-prefix-when-HTTP-path-is-relative.patch
diff --git a/0230-Make-linux_arm_kernel_header.hdr_offset-be-at-the-ri.patch b/0228-Make-linux_arm_kernel_header.hdr_offset-be-at-the-ri.patch
similarity index 100%
rename from 0230-Make-linux_arm_kernel_header.hdr_offset-be-at-the-ri.patch
rename to 0228-Make-linux_arm_kernel_header.hdr_offset-be-at-the-ri.patch
diff --git a/0231-Mark-some-unused-stuff-unused.patch b/0229-Mark-some-unused-stuff-unused.patch
similarity index 100%
rename from 0231-Mark-some-unused-stuff-unused.patch
rename to 0229-Mark-some-unused-stuff-unused.patch
diff --git a/0232-Make-grub_error-more-verbose.patch b/0230-Make-grub_error-more-verbose.patch
similarity index 100%
rename from 0232-Make-grub_error-more-verbose.patch
rename to 0230-Make-grub_error-more-verbose.patch
diff --git a/0233-Make-reset-an-alias-for-the-reboot-command.patch b/0231-Make-reset-an-alias-for-the-reboot-command.patch
similarity index 100%
rename from 0233-Make-reset-an-alias-for-the-reboot-command.patch
rename to 0231-Make-reset-an-alias-for-the-reboot-command.patch
diff --git a/0234-EFI-more-debug-output-on-GOP-and-UGA-probing.patch b/0232-EFI-more-debug-output-on-GOP-and-UGA-probing.patch
similarity index 100%
rename from 0234-EFI-more-debug-output-on-GOP-and-UGA-probing.patch
rename to 0232-EFI-more-debug-output-on-GOP-and-UGA-probing.patch
diff --git a/0235-Add-a-version-command.patch b/0233-Add-a-version-command.patch
similarity index 100%
rename from 0235-Add-a-version-command.patch
rename to 0233-Add-a-version-command.patch
diff --git a/0236-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch b/0234-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
similarity index 100%
rename from 0236-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
rename to 0234-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
diff --git a/0237-arm-arm64-loader-Better-memory-allocation-and-error-.patch b/0235-arm-arm64-loader-Better-memory-allocation-and-error-.patch
similarity index 100%
rename from 0237-arm-arm64-loader-Better-memory-allocation-and-error-.patch
rename to 0235-arm-arm64-loader-Better-memory-allocation-and-error-.patch
diff --git a/0238-Try-to-pick-better-locations-for-kernel-and-initrd.patch b/0236-Try-to-pick-better-locations-for-kernel-and-initrd.patch
similarity index 100%
rename from 0238-Try-to-pick-better-locations-for-kernel-and-initrd.patch
rename to 0236-Try-to-pick-better-locations-for-kernel-and-initrd.patch
diff --git a/0239-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch b/0237-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
similarity index 100%
rename from 0239-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
rename to 0237-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
diff --git a/0240-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch b/0238-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
similarity index 100%
rename from 0240-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
rename to 0238-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
diff --git a/0241-grub-boot-success.timer-Add-a-few-Conditions-for-run.patch b/0239-grub-boot-success.timer-Add-a-few-Conditions-for-run.patch
similarity index 100%
rename from 0241-grub-boot-success.timer-Add-a-few-Conditions-for-run.patch
rename to 0239-grub-boot-success.timer-Add-a-few-Conditions-for-run.patch
diff --git a/0242-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch b/0240-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
similarity index 100%
rename from 0242-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
rename to 0240-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
diff --git a/0243-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch b/0241-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
similarity index 100%
rename from 0243-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
rename to 0241-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
diff --git a/0244-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch b/0242-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
similarity index 100%
rename from 0244-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
rename to 0242-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
diff --git a/0245-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch b/0243-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
similarity index 100%
rename from 0245-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
rename to 0243-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
diff --git a/0246-docs-Stop-using-polkit-pkexec-for-grub-boot-success..patch b/0244-docs-Stop-using-polkit-pkexec-for-grub-boot-success..patch
similarity index 100%
rename from 0246-docs-Stop-using-polkit-pkexec-for-grub-boot-success..patch
rename to 0244-docs-Stop-using-polkit-pkexec-for-grub-boot-success..patch
diff --git a/0247-drop-TPM-support-for-legacy-BIOS.patch b/0245-drop-TPM-support-for-legacy-BIOS.patch
similarity index 100%
rename from 0247-drop-TPM-support-for-legacy-BIOS.patch
rename to 0245-drop-TPM-support-for-legacy-BIOS.patch
diff --git a/0248-Move-quicksort-function-from-kernel.exec-to-the-blsc.patch b/0246-Move-quicksort-function-from-kernel.exec-to-the-blsc.patch
similarity index 100%
rename from 0248-Move-quicksort-function-from-kernel.exec-to-the-blsc.patch
rename to 0246-Move-quicksort-function-from-kernel.exec-to-the-blsc.patch
diff --git a/0249-Include-blscfg-module-for-powerpc-ieee1275.patch b/0247-Include-blscfg-module-for-powerpc-ieee1275.patch
similarity index 100%
rename from 0249-Include-blscfg-module-for-powerpc-ieee1275.patch
rename to 0247-Include-blscfg-module-for-powerpc-ieee1275.patch
diff --git a/0250-grub-switch-to-blscfg-copy-blscfg-module-for-legacy-.patch b/0248-grub-switch-to-blscfg-copy-blscfg-module-for-legacy-.patch
similarity index 100%
rename from 0250-grub-switch-to-blscfg-copy-blscfg-module-for-legacy-.patch
rename to 0248-grub-switch-to-blscfg-copy-blscfg-module-for-legacy-.patch
diff --git a/0251-Fix-getroot.c-s-trampolines.patch b/0249-Fix-getroot.c-s-trampolines.patch
similarity index 100%
rename from 0251-Fix-getroot.c-s-trampolines.patch
rename to 0249-Fix-getroot.c-s-trampolines.patch
diff --git a/0252-Do-not-allow-stack-trampolines-anywhere.patch b/0250-Do-not-allow-stack-trampolines-anywhere.patch
similarity index 100%
rename from 0252-Do-not-allow-stack-trampolines-anywhere.patch
rename to 0250-Do-not-allow-stack-trampolines-anywhere.patch
diff --git a/0253-Reimplement-boot_counter.patch b/0251-Reimplement-boot_counter.patch
similarity index 100%
rename from 0253-Reimplement-boot_counter.patch
rename to 0251-Reimplement-boot_counter.patch
diff --git a/0254-blscfg-don-t-include-.conf-at-the-end-of-our-id.patch b/0252-blscfg-don-t-include-.conf-at-the-end-of-our-id.patch
similarity index 100%
rename from 0254-blscfg-don-t-include-.conf-at-the-end-of-our-id.patch
rename to 0252-blscfg-don-t-include-.conf-at-the-end-of-our-id.patch
diff --git a/0255-grub-get-kernel-settings-expose-some-more-config-var.patch b/0253-grub-get-kernel-settings-expose-some-more-config-var.patch
similarity index 100%
rename from 0255-grub-get-kernel-settings-expose-some-more-config-var.patch
rename to 0253-grub-get-kernel-settings-expose-some-more-config-var.patch
diff --git a/0256-Reimplement-boot_counter.patch b/0254-Reimplement-boot_counter.patch
similarity index 100%
rename from 0256-Reimplement-boot_counter.patch
rename to 0254-Reimplement-boot_counter.patch
diff --git a/0257-add-10_linux_bls-grub.d-snippet-to-generate-menu-ent.patch b/0255-add-10_linux_bls-grub.d-snippet-to-generate-menu-ent.patch
similarity index 100%
rename from 0257-add-10_linux_bls-grub.d-snippet-to-generate-menu-ent.patch
rename to 0255-add-10_linux_bls-grub.d-snippet-to-generate-menu-ent.patch
diff --git a/0258-Only-set-kernelopts-in-grubenv-if-it-wasn-t-set-befo.patch b/0256-Only-set-kernelopts-in-grubenv-if-it-wasn-t-set-befo.patch
similarity index 100%
rename from 0258-Only-set-kernelopts-in-grubenv-if-it-wasn-t-set-befo.patch
rename to 0256-Only-set-kernelopts-in-grubenv-if-it-wasn-t-set-befo.patch
diff --git a/0259-blscfg-sort-everything-with-rpm-package-comparison.patch b/0257-blscfg-sort-everything-with-rpm-package-comparison.patch
similarity index 100%
rename from 0259-blscfg-sort-everything-with-rpm-package-comparison.patch
rename to 0257-blscfg-sort-everything-with-rpm-package-comparison.patch
diff --git a/0260-10_linux_bls-use-grub2-rpm-sort-instead-of-ls-vr-to-.patch b/0258-10_linux_bls-use-grub2-rpm-sort-instead-of-ls-vr-to-.patch
similarity index 100%
rename from 0260-10_linux_bls-use-grub2-rpm-sort-instead-of-ls-vr-to-.patch
rename to 0258-10_linux_bls-use-grub2-rpm-sort-instead-of-ls-vr-to-.patch
diff --git a/0261-don-t-set-saved_entry-on-grub2-mkconfig.patch b/0259-don-t-set-saved_entry-on-grub2-mkconfig.patch
similarity index 100%
rename from 0261-don-t-set-saved_entry-on-grub2-mkconfig.patch
rename to 0259-don-t-set-saved_entry-on-grub2-mkconfig.patch
diff --git a/0262-grub-switch-to-blscfg-use-debug-instead-of-debug-as-.patch b/0260-grub-switch-to-blscfg-use-debug-instead-of-debug-as-.patch
similarity index 100%
rename from 0262-grub-switch-to-blscfg-use-debug-instead-of-debug-as-.patch
rename to 0260-grub-switch-to-blscfg-use-debug-instead-of-debug-as-.patch
diff --git a/0263-Make-blscfg-debug-messages-more-useful.patch b/0261-Make-blscfg-debug-messages-more-useful.patch
similarity index 100%
rename from 0263-Make-blscfg-debug-messages-more-useful.patch
rename to 0261-Make-blscfg-debug-messages-more-useful.patch
diff --git a/0264-Make-grub_strtoul-end-pointer-have-the-right-constif.patch b/0262-Make-grub_strtoul-end-pointer-have-the-right-constif.patch
similarity index 100%
rename from 0264-Make-grub_strtoul-end-pointer-have-the-right-constif.patch
rename to 0262-Make-grub_strtoul-end-pointer-have-the-right-constif.patch
diff --git a/0265-Fix-menu-entry-selection-based-on-ID-and-title.patch b/0263-Fix-menu-entry-selection-based-on-ID-and-title.patch
similarity index 100%
rename from 0265-Fix-menu-entry-selection-based-on-ID-and-title.patch
rename to 0263-Fix-menu-entry-selection-based-on-ID-and-title.patch
diff --git a/0264-Add-comments-and-revert-logic-changes-in-01_fallback.patch b/0264-Add-comments-and-revert-logic-changes-in-01_fallback.patch
new file mode 100644
index 00000000..cc5f8a87
--- /dev/null
+++ b/0264-Add-comments-and-revert-logic-changes-in-01_fallback.patch
@@ -0,0 +1,48 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Christian Glombek <lorbus@fedoraproject.org>
+Date: Mon, 8 Oct 2018 11:57:04 +0200
+Subject: [PATCH] Add comments and revert logic changes in 01_fallback_counting
+
+---
+ util/grub.d/01_fallback_counting.in | 27 +++++++++++++++------------
+ 1 file changed, 15 insertions(+), 12 deletions(-)
+
+diff --git a/util/grub.d/01_fallback_counting.in b/util/grub.d/01_fallback_counting.in
+index 1a0b5fbecfc..be0e770ea82 100644
+--- a/util/grub.d/01_fallback_counting.in
++++ b/util/grub.d/01_fallback_counting.in
+@@ -1,19 +1,22 @@
+ #! /bin/sh -e
+ 
+-if ! systemctl -q is-enabled greenboot.service >/dev/null 2>&1 ; then
+-  exit 0
+-fi
+-
+ # Boot Counting
++# The boot_counter env var can be used to count down boot attempts after an
++# OSTree upgrade and choose the rollback deployment when 0 is reached.  Both
++# boot_counter and boot_success need to be (re-)set from userspace.
+ cat << EOF
+ insmod increment
+-if [ -z "\${boot_counter}" ]; then
+-  set boot_counter=0
+-elif [ "\${boot_counter}" = "0" -o "\${boot_counter}" = "-1" ]; then
+-  increment default
+-  set boot_counter=-1
+-else
+-  decrement boot_counter
++# Check if boot_counter exists and boot_success=0 to activate this behaviour.
++if [ -n "\${boot_counter}" -a "\${boot_success}" = "0" ]; then
++  # if countdown has ended, choose to boot rollback deployment (default=1 on
++  # OSTree-based systems)
++  if  [ "\${boot_counter}" = "0" -o "\${boot_counter}" = "-1" ]; then
++    set default=1
++    set boot_counter=-1
++  # otherwise decrement boot_counter
++  else
++    decrement boot_counter
++  fi
++  save_env boot_counter
+ fi
+-save_env boot_counter
+ EOF
diff --git a/0265-Remove-quotes-when-reading-ID-value-from-etc-os-rele.patch b/0265-Remove-quotes-when-reading-ID-value-from-etc-os-rele.patch
new file mode 100644
index 00000000..b81f46f3
--- /dev/null
+++ b/0265-Remove-quotes-when-reading-ID-value-from-etc-os-rele.patch
@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas <javierm@redhat.com>
+Date: Wed, 21 Nov 2018 15:37:32 +0100
+Subject: [PATCH] Remove quotes when reading ID value from /etc/os-release
+
+The field is used to obtain the path to the GRUB directory in the ESP for
+UEFI installs. But in some OS the ID value is quoted, which leads to some
+of the scripts to fail:
+
+  $ grub2-setpassword
+  /boot/efi/EFI/"redhat"/ does not exist.
+  Usage: /usr/sbin/grub2-setpassword [OPTION]
+
+Related: rhbz#1650706
+
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+---
+ util/grub-set-password.in     | 2 +-
+ util/grub-switch-to-blscfg.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/util/grub-set-password.in b/util/grub-set-password.in
+index 5ebf50576d6..c0b5ebbfdc5 100644
+--- a/util/grub-set-password.in
++++ b/util/grub-set-password.in
+@@ -1,6 +1,6 @@
+ #!/bin/sh -e
+ 
+-EFIDIR=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')
++EFIDIR=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/' -e 's/\"//g')
+ if [ -d /sys/firmware/efi/efivars/ ]; then
+     grubdir=`echo "/@bootdirname@/efi/EFI/${EFIDIR}/" | sed 's,//*,/,g'`
+ else
+diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
+index 60cd6ca63cc..d353370cc51 100644
+--- a/util/grub-switch-to-blscfg.in
++++ b/util/grub-switch-to-blscfg.in
+@@ -40,7 +40,7 @@ etcdefaultgrub=/etc/default/grub
+ 
+ eval "$("${grub_get_kernel_settings}")" || true
+ 
+-EFIDIR=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')
++EFIDIR=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/' -e 's/\"//g')
+ if [ -d /sys/firmware/efi/efivars/ ]; then
+     startlink=/etc/grub2-efi.cfg
+     grubdir=`echo "/@bootdirname@/efi/EFI/${EFIDIR}/" | sed 's,//*,/,g'`
diff --git a/0266-blscfg-expand-grub_users-before-passing-to-grub_norm.patch b/0266-blscfg-expand-grub_users-before-passing-to-grub_norm.patch
new file mode 100644
index 00000000..d5951b4a
--- /dev/null
+++ b/0266-blscfg-expand-grub_users-before-passing-to-grub_norm.patch
@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas <javierm@redhat.com>
+Date: Wed, 21 Nov 2018 15:38:50 +0100
+Subject: [PATCH] blscfg: expand grub_users before passing to
+ grub_normal_add_menu_entry()
+
+The "grub_users" field from the BLS snippet file is used to specifcy the
+users that are allowed to execute a given menu entry if the "superusers"
+environment variable is set.
+
+If the "grub_users" isn't set, the menu entry is unrestricted and it can
+be executed without any authentication and if is set then only the users
+defined in "grub_users" can execute the menu entry after authentication.
+
+But this field can contain an environment variable so has to be expanded
+or otherwise grub2 will wrongly assume that the user is "$var", and will
+populate a menu entry that it's resctrited even when "$var" isn't set.
+
+Resolves: rhbz#1650706
+
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+---
+ grub-core/commands/blscfg.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
+index 42892cbfd55..c432c6ba27a 100644
+--- a/grub-core/commands/blscfg.c
++++ b/grub-core/commands/blscfg.c
+@@ -704,7 +704,7 @@ static void create_entry (struct bls_entry *entry)
+   initrds = bls_make_list (entry, "initrd", NULL);
+ 
+   hotkey = bls_get_val (entry, "grub_hotkey", NULL);
+-  users = bls_get_val (entry, "grub_users", NULL);
++  users = expand_val (bls_get_val (entry, "grub_users", NULL));
+   classes = bls_make_list (entry, "grub_class", NULL);
+   args = bls_make_list (entry, "grub_arg", &argc);
+ 
diff --git a/0267-Make-the-menu-entry-users-option-argument-to-be-opti.patch b/0267-Make-the-menu-entry-users-option-argument-to-be-opti.patch
new file mode 100644
index 00000000..50479ceb
--- /dev/null
+++ b/0267-Make-the-menu-entry-users-option-argument-to-be-opti.patch
@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas <javierm@redhat.com>
+Date: Mon, 26 Nov 2018 10:06:42 +0100
+Subject: [PATCH] Make the menu entry users option argument to be optional
+
+The --users option is used to restrict the access to specific menu entries
+only to a set of users. But the option requires an argument to either be a
+constant or a variable that has been set. So for example the following:
+
+  menuentry "May be run by superusers or users in $users" --users $users {
+  	    linux /vmlinuz
+  }
+
+Would fail if $users is not defined and grub would discard the menu entry.
+Instead, allow the --users option to have an optional argument and ignore
+the option if the argument was not set.
+
+Related: rhbz#1652434
+
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+---
+ grub-core/commands/menuentry.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
+index 8d242b0187e..7004e08ce78 100644
+--- a/grub-core/commands/menuentry.c
++++ b/grub-core/commands/menuentry.c
+@@ -29,7 +29,7 @@ static const struct grub_arg_option options[] =
+   {
+     {"class", 1, GRUB_ARG_OPTION_REPEATABLE,
+      N_("Menu entry type."), N_("STRING"), ARG_TYPE_STRING},
+-    {"users", 2, 0,
++    {"users", 2, GRUB_ARG_OPTION_OPTIONAL,
+      N_("List of users allowed to boot this entry."), N_("USERNAME[,USERNAME]"),
+      ARG_TYPE_STRING},
+     {"hotkey", 3, 0,
+@@ -280,7 +280,7 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
+   if (! ctxt->state[3].set && ! ctxt->script)
+     return grub_error (GRUB_ERR_BAD_ARGUMENT, "no menuentry definition");
+ 
+-  if (ctxt->state[1].set)
++  if (ctxt->state[1].set && ctxt->state[1].arg)
+     users = ctxt->state[1].arg;
+   else if (ctxt->state[5].set)
+     users = NULL;
diff --git a/0268-10_linux_bls-add-missing-menu-entries-options.patch b/0268-10_linux_bls-add-missing-menu-entries-options.patch
new file mode 100644
index 00000000..620c55d9
--- /dev/null
+++ b/0268-10_linux_bls-add-missing-menu-entries-options.patch
@@ -0,0 +1,56 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas <javierm@redhat.com>
+Date: Thu, 22 Nov 2018 16:12:19 +0100
+Subject: [PATCH] 10_linux_bls: add missing menu entries options
+
+The script that generates menu entries in the grub.cfg from BLS snippets
+wasn't filling some important options, like the --id, --class and --user
+if these were defined in the BLS.
+
+Resolves: rhbz#1652434
+
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+---
+ util/grub.d/10_linux_bls.in | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/util/grub.d/10_linux_bls.in b/util/grub.d/10_linux_bls.in
+index 8745e598d0e..8cff4c58ab5 100644
+--- a/util/grub.d/10_linux_bls.in
++++ b/util/grub.d/10_linux_bls.in
+@@ -127,6 +127,9 @@ read_config()
+     initrd=""
+     options=""
+     linux=""
++    grub_users=""
++    grub_arg=""
++    grub_class=""
+ 
+     while read -r line
+     do
+@@ -145,6 +148,15 @@ read_config()
+             "options")
+                 options=${value}
+                 ;;
++            "grub_users")
++                grub_users=${value}
++                ;;
++            "grub_arg")
++                grub_arg=${value}
++                ;;
++            "grub_class")
++                grub_class=${value}
++                ;;
+         esac
+     done < ${config_file}
+ }
+@@ -167,7 +179,8 @@ populate_menu()
+ 
+     for bls in "${files[@]}" ; do
+         read_config "${blsdir}/${bls}.conf"
+-        menu="${menu}menuentry '${title}' {\n"
++
++        menu="${menu}menuentry '${title}' --class ${grub_class} ${grub_arg} --users ${grub_users} --id ${bls} {\n"
+         menu="${menu}\t linux ${linux} ${options}\n"
+         if [ -n "${initrd}" ] ; then
+             menu="${menu}\t initrd ${boot_prefix}${initrd}\n"
diff --git a/0269-Fix-menu-entry-selection-based-on-title.patch b/0269-Fix-menu-entry-selection-based-on-title.patch
new file mode 100644
index 00000000..31825b00
--- /dev/null
+++ b/0269-Fix-menu-entry-selection-based-on-title.patch
@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas <javierm@redhat.com>
+Date: Fri, 30 Nov 2018 16:39:09 +0100
+Subject: [PATCH] Fix menu entry selection based on title
+
+The get_entry_number_helper() function assumes that there could be a set
+of entries identifiers in a variable (i.e: as used in the fallback case)
+so iterates over the string until it finds a space to get the first id.
+
+But this should only be done for indexes or entries id, since the title
+can contain spaces. In the case of title, the complete string should be
+used to select a given entry.
+
+Resolves: rhbz#1654936
+
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+---
+ grub-core/normal/menu.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
+index 95f7abaf2fd..fc25c702f3c 100644
+--- a/grub-core/normal/menu.c
++++ b/grub-core/normal/menu.c
+@@ -217,14 +217,11 @@ get_entry_number_helper(grub_menu_t menu,
+ 
+   for (i = 0, e = menu->entry_list; e; i++)
+     {
+-      int l = 0;
+-      while (val[l] && !grub_isspace(val[l]))
+-	l++;
+ 
+-      if (menuentry_eq (e->title, val, l))
++      if (menuentry_eq (e->title, val, -1))
+ 	{
+ 	  if (tail)
+-	    *tail = val + l;
++	    *tail = NULL;
+ 	  return i;
+ 	}
+       e = e->next;
diff --git a/grub.patches b/grub.patches
index e3113be6..e79eeda3 100644
--- a/grub.patches
+++ b/grub.patches
@@ -63,203 +63,207 @@ Patch0062: 0062-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
 Patch0063: 0063-Add-friendly-grub2-password-config-tool-985962.patch
 Patch0064: 0064-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch
 Patch0065: 0065-tcp-add-window-scaling-support.patch
-Patch0066: 0066-efinet-retransmit-if-our-device-is-busy.patch
-Patch0067: 0067-Be-more-aggro-about-actually-using-the-configured-ne.patch
-Patch0068: 0068-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
-Patch0069: 0069-Fix-security-issue-when-reading-username-and-passwor.patch
-Patch0070: 0070-Warn-if-grub-password-will-not-be-read-1290803.patch
-Patch0071: 0071-Clean-up-grub-setpassword-documentation-1290799.patch
-Patch0072: 0072-Fix-locale-issue-in-grub-setpassword-1294243.patch
-Patch0073: 0073-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch
-Patch0074: 0074-efiemu-Fix-compilation-failure.patch
-Patch0075: 0075-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
-Patch0076: 0076-Add-a-url-parser.patch
-Patch0077: 0077-efinet-and-bootp-add-support-for-dhcpv6.patch
-Patch0078: 0078-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
-Patch0079: 0079-Normalize-slashes-in-tftp-paths.patch
-Patch0080: 0080-Fix-malformed-tftp-packets.patch
-Patch0081: 0081-bz1374141-fix-incorrect-mask-for-ppc64.patch
-Patch0082: 0082-Make-grub_fatal-also-backtrace.patch
-Patch0083: 0083-Make-grub-editenv-build-again.patch
-Patch0084: 0084-Fix-up-some-man-pages-rpmdiff-noticed.patch
-Patch0085: 0085-Make-exit-take-a-return-code.patch
-Patch0086: 0086-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch
-Patch0087: 0087-Make-our-info-pages-say-grub2-where-appropriate.patch
-Patch0088: 0088-print-more-debug-info-in-our-module-loader.patch
-Patch0089: 0089-macos-just-build-chainloader-entries-don-t-try-any-x.patch
-Patch0090: 0090-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
-Patch0091: 0091-export-btrfs_subvol-and-btrfs_subvolid.patch
-Patch0092: 0092-grub2-btrfs-03-follow_default.patch
-Patch0093: 0093-grub2-btrfs-04-grub2-install.patch
-Patch0094: 0094-grub2-btrfs-05-grub2-mkconfig.patch
-Patch0095: 0095-grub2-btrfs-06-subvol-mount.patch
-Patch0096: 0096-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch
-Patch0097: 0097-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
-Patch0098: 0098-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
-Patch0099: 0099-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
-Patch0100: 0100-Use-grub_efi_.-memory-helpers-where-reasonable.patch
-Patch0101: 0101-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
-Patch0102: 0102-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch
-Patch0103: 0103-don-t-ignore-const.patch
-Patch0104: 0104-don-t-use-int-for-efi-status.patch
-Patch0105: 0105-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
-Patch0106: 0106-editenv-handle-relative-symlinks.patch
-Patch0107: 0107-Make-libgrub.pp-depend-on-config-util.h.patch
-Patch0108: 0108-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
-Patch0109: 0109-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
-Patch0110: 0110-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
-Patch0111: 0111-align-struct-efi_variable-better.patch
-Patch0112: 0112-Add-quicksort-implementation.patch
-Patch0113: 0113-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch
-Patch0114: 0114-Add-BLS-support-to-grub-mkconfig.patch
-Patch0115: 0115-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch
-Patch0116: 0116-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
-Patch0117: 0117-Enable-blscfg-command-for-the-emu-platform.patch
-Patch0118: 0118-Add-linux-and-initrd-commands-for-grub-emu.patch
-Patch0119: 0119-Fix-the-efidir-in-grub-setpassword.patch
-Patch0120: 0120-Add-grub2-switch-to-blscfg.patch
-Patch0121: 0121-Add-grub_debug_enabled.patch
-Patch0122: 0122-make-better-backtraces.patch
-Patch0123: 0123-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
-Patch0124: 0124-Work-around-some-minor-include-path-weirdnesses.patch
-Patch0125: 0125-Make-it-possible-to-enabled-build-id-sha1.patch
-Patch0126: 0126-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
-Patch0127: 0127-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
-Patch0128: 0128-Only-attempt-to-scan-different-BLS-directories-on-EF.patch
-Patch0129: 0129-Core-TPM-support.patch
-Patch0130: 0130-Measure-kernel-initrd.patch
-Patch0131: 0131-Add-BIOS-boot-measurement.patch
-Patch0132: 0132-Measure-kernel-and-initrd-on-BIOS-systems.patch
-Patch0133: 0133-Measure-the-kernel-commandline.patch
-Patch0134: 0134-Measure-commands.patch
-Patch0135: 0135-Measure-multiboot-images-and-modules.patch
-Patch0136: 0136-Fix-boot-when-there-s-no-TPM.patch
-Patch0137: 0137-Rework-TPM-measurements.patch
-Patch0138: 0138-Fix-event-log-prefix.patch
-Patch0139: 0139-Set-the-first-boot-menu-entry-as-default-when-using-.patch
-Patch0140: 0140-tpm-fix-warnings-when-compiling-for-platforms-other-.patch
-Patch0141: 0141-Make-TPM-errors-less-fatal.patch
-Patch0142: 0142-blscfg-handle-multiple-initramfs-images.patch
-Patch0143: 0143-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch
-Patch0144: 0144-BLS-Use-etcdefaultgrub-instead-of-etc.patch
-Patch0145: 0145-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch
-Patch0146: 0146-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch
-Patch0147: 0147-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch
-Patch0148: 0148-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch
-Patch0149: 0149-Include-OSTree-path-when-searching-kernels-images-if.patch
-Patch0150: 0150-Use-BLS-version-field-to-compare-entries-if-id-field.patch
-Patch0151: 0151-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch
-Patch0152: 0152-Fixup-for-newer-compiler.patch
-Patch0153: 0153-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
-Patch0154: 0154-Simplify-BLS-entry-key-val-pairs-lookup.patch
-Patch0155: 0155-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch
-Patch0156: 0156-Skip-leading-spaces-on-BLS-field-values.patch
-Patch0157: 0157-Fixup-for-newer-compiler.patch
-Patch0158: 0158-TPM-Fix-hash_log_extend_event-function-prototype.patch
-Patch0159: 0159-TPM-Fix-compiler-warnings.patch
-Patch0160: 0160-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch
-Patch0161: 0161-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch
-Patch0162: 0162-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch
-Patch0163: 0163-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch
-Patch0164: 0164-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch
-Patch0165: 0165-Revert-trim-arp-packets-with-abnormal-size.patch
-Patch0166: 0166-Use-xid-to-match-DHCP-replies.patch
-Patch0167: 0167-Add-support-for-non-Ethernet-network-cards.patch
-Patch0168: 0168-misc-fix-invalid-character-recongition-in-strto-l.patch
-Patch0169: 0169-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
-Patch0170: 0170-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch
-Patch0171: 0171-bootp-New-net_bootp6-command.patch
-Patch0172: 0172-Put-back-our-code-to-add-a-local-route.patch
-Patch0173: 0173-efinet-UEFI-IPv6-PXE-support.patch
-Patch0174: 0174-grub.texi-Add-net_bootp6-doument.patch
-Patch0175: 0175-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
-Patch0176: 0176-efinet-Setting-network-from-UEFI-device-path.patch
-Patch0177: 0177-efinet-Setting-DNS-server-from-UEFI-protocol.patch
-Patch0178: 0178-Fix-one-more-coverity-complaint.patch
-Patch0179: 0179-Fix-grub_net_hwaddr_to_str.patch
-Patch0180: 0180-Support-UEFI-networking-protocols.patch
-Patch0181: 0181-AUDIT-0-http-boot-tracker-bug.patch
-Patch0182: 0182-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch
-Patch0183: 0183-efi-uga-use-64-bit-for-fb_base.patch
-Patch0184: 0184-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch
-Patch0185: 0185-EFI-console-Add-grub_console_read_key_stroke-helper-.patch
-Patch0186: 0186-EFI-console-Implement-getkeystatus-support.patch
-Patch0187: 0187-Make-grub_getkeystatus-helper-funtion-available-ever.patch
-Patch0188: 0188-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch
-Patch0189: 0189-grub-editenv-Add-incr-command-to-increment-integer-v.patch
-Patch0190: 0190-Add-auto-hide-menu-support.patch
-Patch0191: 0191-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch
-Patch0192: 0192-Add-grub-set-bootflag-utility.patch
-Patch0193: 0193-Fix-grub-setpassword-o-s-output-path.patch
-Patch0194: 0194-Make-grub-set-password-be-named-like-all-the-other-g.patch
-Patch0195: 0195-docs-Add-grub-boot-indeterminate.service-example.patch
-Patch0196: 0196-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch
-Patch0197: 0197-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch
-Patch0198: 0198-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch
-Patch0199: 0199-gentpl-add-disable-support.patch
-Patch0200: 0200-gentpl-add-pc-firmware-type.patch
-Patch0201: 0201-blscfg-remove-unused-typedef.patch
-Patch0202: 0202-blscfg-don-t-dynamically-allocate-default_blsdir.patch
-Patch0203: 0203-blscfg-sort-BLS-entries-by-version-field.patch
-Patch0204: 0204-blscfg-remove-NULL-guards-around-grub_free.patch
-Patch0205: 0205-blscfg-fix-filename-in-no-linux-key-error.patch
-Patch0206: 0206-blscfg-don-t-leak-bls_entry.filename.patch
-Patch0207: 0207-blscfg-fix-compilation-on-EFI-and-EMU.patch
-Patch0208: 0208-Add-loadenv-to-blscfg-and-loadenv-source-file-list.patch
-Patch0209: 0209-blscfg-Get-rid-of-the-linuxefi-linux16-linux-distinc.patch
-Patch0210: 0210-grub-switch-to-blscfg-Only-fix-boot-prefix-for-non-g.patch
-Patch0211: 0211-blscfg-Expand-the-BLS-options-field-instead-of-showi.patch
-Patch0212: 0212-blscfg-Fallback-to-search-BLS-snippets-in-boot-loade.patch
-Patch0213: 0213-blscfg-Don-t-attempt-to-sort-by-version-if-not-prese.patch
-Patch0214: 0214-blscfg-remove-logic-to-read-the-grubenv-file-and-set.patch
-Patch0215: 0215-Rename-00_menu_auto_hide.in-to-01_menu_auto_hide.in.patch
-Patch0216: 0216-efinet-also-use-the-firmware-acceleration-for-http.patch
-Patch0217: 0217-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
-Patch0218: 0218-Disable-multiboot-multiboot2-and-linux16-modules-on-.patch
-Patch0219: 0219-Force-everything-to-use-python3.patch
-Patch0220: 0220-Fix-an-8-year-old-typo.patch
-Patch0221: 0221-autogen-don-t-run-autoreconf-in-the-topdir.patch
-Patch0222: 0222-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
-Patch0223: 0223-module-verifier-make-it-possible-to-run-checkers-on-.patch
-Patch0224: 0224-grub-module-verifier-report-the-filename-or-modname-.patch
-Patch0225: 0225-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch
-Patch0226: 0226-Rework-how-the-fdt-command-builds.patch
-Patch0227: 0227-Disable-non-wordsize-allocations-on-arm.patch
-Patch0228: 0228-strip-R-.note.gnu.property-at-more-places.patch
-Patch0229: 0229-Prepend-prefix-when-HTTP-path-is-relative.patch
-Patch0230: 0230-Make-linux_arm_kernel_header.hdr_offset-be-at-the-ri.patch
-Patch0231: 0231-Mark-some-unused-stuff-unused.patch
-Patch0232: 0232-Make-grub_error-more-verbose.patch
-Patch0233: 0233-Make-reset-an-alias-for-the-reboot-command.patch
-Patch0234: 0234-EFI-more-debug-output-on-GOP-and-UGA-probing.patch
-Patch0235: 0235-Add-a-version-command.patch
-Patch0236: 0236-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
-Patch0237: 0237-arm-arm64-loader-Better-memory-allocation-and-error-.patch
-Patch0238: 0238-Try-to-pick-better-locations-for-kernel-and-initrd.patch
-Patch0239: 0239-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
-Patch0240: 0240-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
-Patch0241: 0241-grub-boot-success.timer-Add-a-few-Conditions-for-run.patch
-Patch0242: 0242-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
-Patch0243: 0243-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
-Patch0244: 0244-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
-Patch0245: 0245-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
-Patch0246: 0246-docs-Stop-using-polkit-pkexec-for-grub-boot-success..patch
-Patch0247: 0247-drop-TPM-support-for-legacy-BIOS.patch
-Patch0248: 0248-Move-quicksort-function-from-kernel.exec-to-the-blsc.patch
-Patch0249: 0249-Include-blscfg-module-for-powerpc-ieee1275.patch
-Patch0250: 0250-grub-switch-to-blscfg-copy-blscfg-module-for-legacy-.patch
-Patch0251: 0251-Fix-getroot.c-s-trampolines.patch
-Patch0252: 0252-Do-not-allow-stack-trampolines-anywhere.patch
-Patch0253: 0253-Reimplement-boot_counter.patch
-Patch0254: 0254-blscfg-don-t-include-.conf-at-the-end-of-our-id.patch
-Patch0255: 0255-grub-get-kernel-settings-expose-some-more-config-var.patch
-Patch0256: 0256-Reimplement-boot_counter.patch
-Patch0257: 0257-add-10_linux_bls-grub.d-snippet-to-generate-menu-ent.patch
-Patch0258: 0258-Only-set-kernelopts-in-grubenv-if-it-wasn-t-set-befo.patch
-Patch0259: 0259-blscfg-sort-everything-with-rpm-package-comparison.patch
-Patch0260: 0260-10_linux_bls-use-grub2-rpm-sort-instead-of-ls-vr-to-.patch
-Patch0261: 0261-don-t-set-saved_entry-on-grub2-mkconfig.patch
-Patch0262: 0262-grub-switch-to-blscfg-use-debug-instead-of-debug-as-.patch
-Patch0263: 0263-Make-blscfg-debug-messages-more-useful.patch
-Patch0264: 0264-Make-grub_strtoul-end-pointer-have-the-right-constif.patch
-Patch0265: 0265-Fix-menu-entry-selection-based-on-ID-and-title.patch
+Patch0066: 0066-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
+Patch0067: 0067-Fix-security-issue-when-reading-username-and-passwor.patch
+Patch0068: 0068-Warn-if-grub-password-will-not-be-read-1290803.patch
+Patch0069: 0069-Clean-up-grub-setpassword-documentation-1290799.patch
+Patch0070: 0070-Fix-locale-issue-in-grub-setpassword-1294243.patch
+Patch0071: 0071-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch
+Patch0072: 0072-efiemu-Fix-compilation-failure.patch
+Patch0073: 0073-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+Patch0074: 0074-Add-a-url-parser.patch
+Patch0075: 0075-efinet-and-bootp-add-support-for-dhcpv6.patch
+Patch0076: 0076-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
+Patch0077: 0077-Normalize-slashes-in-tftp-paths.patch
+Patch0078: 0078-Fix-malformed-tftp-packets.patch
+Patch0079: 0079-bz1374141-fix-incorrect-mask-for-ppc64.patch
+Patch0080: 0080-Make-grub_fatal-also-backtrace.patch
+Patch0081: 0081-Make-grub-editenv-build-again.patch
+Patch0082: 0082-Fix-up-some-man-pages-rpmdiff-noticed.patch
+Patch0083: 0083-Make-exit-take-a-return-code.patch
+Patch0084: 0084-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch
+Patch0085: 0085-Make-our-info-pages-say-grub2-where-appropriate.patch
+Patch0086: 0086-print-more-debug-info-in-our-module-loader.patch
+Patch0087: 0087-macos-just-build-chainloader-entries-don-t-try-any-x.patch
+Patch0088: 0088-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
+Patch0089: 0089-export-btrfs_subvol-and-btrfs_subvolid.patch
+Patch0090: 0090-grub2-btrfs-03-follow_default.patch
+Patch0091: 0091-grub2-btrfs-04-grub2-install.patch
+Patch0092: 0092-grub2-btrfs-05-grub2-mkconfig.patch
+Patch0093: 0093-grub2-btrfs-06-subvol-mount.patch
+Patch0094: 0094-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch
+Patch0095: 0095-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
+Patch0096: 0096-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
+Patch0097: 0097-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
+Patch0098: 0098-Use-grub_efi_.-memory-helpers-where-reasonable.patch
+Patch0099: 0099-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
+Patch0100: 0100-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch
+Patch0101: 0101-don-t-ignore-const.patch
+Patch0102: 0102-don-t-use-int-for-efi-status.patch
+Patch0103: 0103-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
+Patch0104: 0104-editenv-handle-relative-symlinks.patch
+Patch0105: 0105-Make-libgrub.pp-depend-on-config-util.h.patch
+Patch0106: 0106-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
+Patch0107: 0107-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
+Patch0108: 0108-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
+Patch0109: 0109-align-struct-efi_variable-better.patch
+Patch0110: 0110-Add-quicksort-implementation.patch
+Patch0111: 0111-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch
+Patch0112: 0112-Add-BLS-support-to-grub-mkconfig.patch
+Patch0113: 0113-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch
+Patch0114: 0114-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
+Patch0115: 0115-Enable-blscfg-command-for-the-emu-platform.patch
+Patch0116: 0116-Add-linux-and-initrd-commands-for-grub-emu.patch
+Patch0117: 0117-Fix-the-efidir-in-grub-setpassword.patch
+Patch0118: 0118-Add-grub2-switch-to-blscfg.patch
+Patch0119: 0119-Add-grub_debug_enabled.patch
+Patch0120: 0120-make-better-backtraces.patch
+Patch0121: 0121-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
+Patch0122: 0122-Work-around-some-minor-include-path-weirdnesses.patch
+Patch0123: 0123-Make-it-possible-to-enabled-build-id-sha1.patch
+Patch0124: 0124-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
+Patch0125: 0125-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
+Patch0126: 0126-Only-attempt-to-scan-different-BLS-directories-on-EF.patch
+Patch0127: 0127-Core-TPM-support.patch
+Patch0128: 0128-Measure-kernel-initrd.patch
+Patch0129: 0129-Add-BIOS-boot-measurement.patch
+Patch0130: 0130-Measure-kernel-and-initrd-on-BIOS-systems.patch
+Patch0131: 0131-Measure-the-kernel-commandline.patch
+Patch0132: 0132-Measure-commands.patch
+Patch0133: 0133-Measure-multiboot-images-and-modules.patch
+Patch0134: 0134-Fix-boot-when-there-s-no-TPM.patch
+Patch0135: 0135-Rework-TPM-measurements.patch
+Patch0136: 0136-Fix-event-log-prefix.patch
+Patch0137: 0137-Set-the-first-boot-menu-entry-as-default-when-using-.patch
+Patch0138: 0138-tpm-fix-warnings-when-compiling-for-platforms-other-.patch
+Patch0139: 0139-Make-TPM-errors-less-fatal.patch
+Patch0140: 0140-blscfg-handle-multiple-initramfs-images.patch
+Patch0141: 0141-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch
+Patch0142: 0142-BLS-Use-etcdefaultgrub-instead-of-etc.patch
+Patch0143: 0143-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch
+Patch0144: 0144-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch
+Patch0145: 0145-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch
+Patch0146: 0146-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch
+Patch0147: 0147-Include-OSTree-path-when-searching-kernels-images-if.patch
+Patch0148: 0148-Use-BLS-version-field-to-compare-entries-if-id-field.patch
+Patch0149: 0149-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch
+Patch0150: 0150-Fixup-for-newer-compiler.patch
+Patch0151: 0151-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
+Patch0152: 0152-Simplify-BLS-entry-key-val-pairs-lookup.patch
+Patch0153: 0153-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch
+Patch0154: 0154-Skip-leading-spaces-on-BLS-field-values.patch
+Patch0155: 0155-Fixup-for-newer-compiler.patch
+Patch0156: 0156-TPM-Fix-hash_log_extend_event-function-prototype.patch
+Patch0157: 0157-TPM-Fix-compiler-warnings.patch
+Patch0158: 0158-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch
+Patch0159: 0159-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch
+Patch0160: 0160-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch
+Patch0161: 0161-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch
+Patch0162: 0162-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch
+Patch0163: 0163-Revert-trim-arp-packets-with-abnormal-size.patch
+Patch0164: 0164-Use-xid-to-match-DHCP-replies.patch
+Patch0165: 0165-Add-support-for-non-Ethernet-network-cards.patch
+Patch0166: 0166-misc-fix-invalid-character-recongition-in-strto-l.patch
+Patch0167: 0167-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
+Patch0168: 0168-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch
+Patch0169: 0169-bootp-New-net_bootp6-command.patch
+Patch0170: 0170-Put-back-our-code-to-add-a-local-route.patch
+Patch0171: 0171-efinet-UEFI-IPv6-PXE-support.patch
+Patch0172: 0172-grub.texi-Add-net_bootp6-doument.patch
+Patch0173: 0173-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
+Patch0174: 0174-efinet-Setting-network-from-UEFI-device-path.patch
+Patch0175: 0175-efinet-Setting-DNS-server-from-UEFI-protocol.patch
+Patch0176: 0176-Fix-one-more-coverity-complaint.patch
+Patch0177: 0177-Fix-grub_net_hwaddr_to_str.patch
+Patch0178: 0178-Support-UEFI-networking-protocols.patch
+Patch0179: 0179-AUDIT-0-http-boot-tracker-bug.patch
+Patch0180: 0180-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch
+Patch0181: 0181-efi-uga-use-64-bit-for-fb_base.patch
+Patch0182: 0182-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch
+Patch0183: 0183-EFI-console-Add-grub_console_read_key_stroke-helper-.patch
+Patch0184: 0184-EFI-console-Implement-getkeystatus-support.patch
+Patch0185: 0185-Make-grub_getkeystatus-helper-funtion-available-ever.patch
+Patch0186: 0186-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch
+Patch0187: 0187-grub-editenv-Add-incr-command-to-increment-integer-v.patch
+Patch0188: 0188-Add-auto-hide-menu-support.patch
+Patch0189: 0189-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch
+Patch0190: 0190-Add-grub-set-bootflag-utility.patch
+Patch0191: 0191-Fix-grub-setpassword-o-s-output-path.patch
+Patch0192: 0192-Make-grub-set-password-be-named-like-all-the-other-g.patch
+Patch0193: 0193-docs-Add-grub-boot-indeterminate.service-example.patch
+Patch0194: 0194-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch
+Patch0195: 0195-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch
+Patch0196: 0196-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch
+Patch0197: 0197-gentpl-add-disable-support.patch
+Patch0198: 0198-gentpl-add-pc-firmware-type.patch
+Patch0199: 0199-blscfg-remove-unused-typedef.patch
+Patch0200: 0200-blscfg-don-t-dynamically-allocate-default_blsdir.patch
+Patch0201: 0201-blscfg-sort-BLS-entries-by-version-field.patch
+Patch0202: 0202-blscfg-remove-NULL-guards-around-grub_free.patch
+Patch0203: 0203-blscfg-fix-filename-in-no-linux-key-error.patch
+Patch0204: 0204-blscfg-don-t-leak-bls_entry.filename.patch
+Patch0205: 0205-blscfg-fix-compilation-on-EFI-and-EMU.patch
+Patch0206: 0206-Add-loadenv-to-blscfg-and-loadenv-source-file-list.patch
+Patch0207: 0207-blscfg-Get-rid-of-the-linuxefi-linux16-linux-distinc.patch
+Patch0208: 0208-grub-switch-to-blscfg-Only-fix-boot-prefix-for-non-g.patch
+Patch0209: 0209-blscfg-Expand-the-BLS-options-field-instead-of-showi.patch
+Patch0210: 0210-blscfg-Fallback-to-search-BLS-snippets-in-boot-loade.patch
+Patch0211: 0211-blscfg-Don-t-attempt-to-sort-by-version-if-not-prese.patch
+Patch0212: 0212-blscfg-remove-logic-to-read-the-grubenv-file-and-set.patch
+Patch0213: 0213-Rename-00_menu_auto_hide.in-to-01_menu_auto_hide.in.patch
+Patch0214: 0214-efinet-also-use-the-firmware-acceleration-for-http.patch
+Patch0215: 0215-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
+Patch0216: 0216-Disable-multiboot-multiboot2-and-linux16-modules-on-.patch
+Patch0217: 0217-Force-everything-to-use-python3.patch
+Patch0218: 0218-Fix-an-8-year-old-typo.patch
+Patch0219: 0219-autogen-don-t-run-autoreconf-in-the-topdir.patch
+Patch0220: 0220-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
+Patch0221: 0221-module-verifier-make-it-possible-to-run-checkers-on-.patch
+Patch0222: 0222-grub-module-verifier-report-the-filename-or-modname-.patch
+Patch0223: 0223-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch
+Patch0224: 0224-Rework-how-the-fdt-command-builds.patch
+Patch0225: 0225-Disable-non-wordsize-allocations-on-arm.patch
+Patch0226: 0226-strip-R-.note.gnu.property-at-more-places.patch
+Patch0227: 0227-Prepend-prefix-when-HTTP-path-is-relative.patch
+Patch0228: 0228-Make-linux_arm_kernel_header.hdr_offset-be-at-the-ri.patch
+Patch0229: 0229-Mark-some-unused-stuff-unused.patch
+Patch0230: 0230-Make-grub_error-more-verbose.patch
+Patch0231: 0231-Make-reset-an-alias-for-the-reboot-command.patch
+Patch0232: 0232-EFI-more-debug-output-on-GOP-and-UGA-probing.patch
+Patch0233: 0233-Add-a-version-command.patch
+Patch0234: 0234-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
+Patch0235: 0235-arm-arm64-loader-Better-memory-allocation-and-error-.patch
+Patch0236: 0236-Try-to-pick-better-locations-for-kernel-and-initrd.patch
+Patch0237: 0237-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
+Patch0238: 0238-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
+Patch0239: 0239-grub-boot-success.timer-Add-a-few-Conditions-for-run.patch
+Patch0240: 0240-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
+Patch0241: 0241-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
+Patch0242: 0242-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
+Patch0243: 0243-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
+Patch0244: 0244-docs-Stop-using-polkit-pkexec-for-grub-boot-success..patch
+Patch0245: 0245-drop-TPM-support-for-legacy-BIOS.patch
+Patch0246: 0246-Move-quicksort-function-from-kernel.exec-to-the-blsc.patch
+Patch0247: 0247-Include-blscfg-module-for-powerpc-ieee1275.patch
+Patch0248: 0248-grub-switch-to-blscfg-copy-blscfg-module-for-legacy-.patch
+Patch0249: 0249-Fix-getroot.c-s-trampolines.patch
+Patch0250: 0250-Do-not-allow-stack-trampolines-anywhere.patch
+Patch0251: 0251-Reimplement-boot_counter.patch
+Patch0252: 0252-blscfg-don-t-include-.conf-at-the-end-of-our-id.patch
+Patch0253: 0253-grub-get-kernel-settings-expose-some-more-config-var.patch
+Patch0254: 0254-Reimplement-boot_counter.patch
+Patch0255: 0255-add-10_linux_bls-grub.d-snippet-to-generate-menu-ent.patch
+Patch0256: 0256-Only-set-kernelopts-in-grubenv-if-it-wasn-t-set-befo.patch
+Patch0257: 0257-blscfg-sort-everything-with-rpm-package-comparison.patch
+Patch0258: 0258-10_linux_bls-use-grub2-rpm-sort-instead-of-ls-vr-to-.patch
+Patch0259: 0259-don-t-set-saved_entry-on-grub2-mkconfig.patch
+Patch0260: 0260-grub-switch-to-blscfg-use-debug-instead-of-debug-as-.patch
+Patch0261: 0261-Make-blscfg-debug-messages-more-useful.patch
+Patch0262: 0262-Make-grub_strtoul-end-pointer-have-the-right-constif.patch
+Patch0263: 0263-Fix-menu-entry-selection-based-on-ID-and-title.patch
+Patch0264: 0264-Add-comments-and-revert-logic-changes-in-01_fallback.patch
+Patch0265: 0265-Remove-quotes-when-reading-ID-value-from-etc-os-rele.patch
+Patch0266: 0266-blscfg-expand-grub_users-before-passing-to-grub_norm.patch
+Patch0267: 0267-Make-the-menu-entry-users-option-argument-to-be-opti.patch
+Patch0268: 0268-10_linux_bls-add-missing-menu-entries-options.patch
+Patch0269: 0269-Fix-menu-entry-selection-based-on-title.patch
diff --git a/grub2.spec b/grub2.spec
index c4a5ad64..730855e9 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -7,7 +7,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.02
-Release:	63%{?dist}
+Release:	64%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 Group:		System Environment/Base
 License:	GPLv3+
@@ -492,6 +492,23 @@ fi
 %endif
 
 %changelog
+* Fri Nov 30 2018 Javier Martinez Canillas <javierm@redhat.com> - 2.02-64
+- Add comments and revert logic changes in 01_fallback_counting
+- Remove quotes when reading ID value from /etc/os-release
+  Related: rhbz#1650706
+- blscfg: expand grub_users before passing to grub_normal_add_menu_entry()
+  Resolves: rhbz#1650706
+- Drop buggy downstream patch "efinet: retransmit if our device is busy"
+  Resolves: rhbz#1649048
+- Make the menu entry users option argument to be optional
+  Related: rhbz#1652434
+- 10_linux_bls: add missing menu entries options
+  Resolves: rhbz#1652434
+- Drop "Be more aggro about actually using the *configured* network device."
+  Resolves: rhbz#1654388
+- Fix menu entry selection based on title
+  Resolves: rhbz#1654936
+
 * Wed Nov 21 2018 Javier Martinez Canillas <javierm@redhat.com> - 2.02-63
 - add 10_linux_bls grub.d snippet to generate menu entries from BLS files
   Resolves: rhbz#1636013