rpms
/
grub2
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebased to newer upstream for fedora-26 

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2016-12-02 16:18:30 -05:00
parent 0773b3d5c8
commit 377f5fc2d0
92 changed files with 207 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-IBM-client-architecture-CAS-reboot-support.patch
View File

@ -1,7 +1,7 @@
From e32c57d2abd034cbdea24a8f51de8dbef453bd96 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Thu, 20 Sep 2012 18:07:39 -0300
Subject: [PATCH 01/89] IBM client architecture (CAS) reboot support
Subject: [PATCH 01/90] IBM client architecture (CAS) reboot support
This is an implementation of IBM client architecture (CAS) reboot for GRUB.

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

@ -1,7 +1,7 @@
From 4f82466e3b1fcf3370d82432e406f51906e1fa46 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Wed, 24 Apr 2013 10:51:48 -0300
Subject: [PATCH 02/89] for ppc, reset console display attr when clear screen
Subject: [PATCH 02/90] for ppc, reset console display attr when clear screen
v2: Also use \x0c instead of a literal ^L to make future patches less
awkward.

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

@ -1,7 +1,7 @@
From 9cff6efa3a7e15a6968fed29a29f38713da864fd Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Tue, 11 Jun 2013 15:14:05 -0300
Subject: [PATCH 03/89] Disable GRUB video support for IBM power machines
Subject: [PATCH 03/90] Disable GRUB video support for IBM power machines
Should fix the problem in bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=973205

2
0004-Fix-bzr-s-ignore-artificats-in-.gitignore.patch
View File

@ -1,7 +1,7 @@
From 512fe6865738286c94f87da64ca6b475bc3e2f38 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 7 Jul 2015 10:13:14 -0400
Subject: [PATCH 04/89] Fix bzr's ignore artificats in .gitignore
Subject: [PATCH 04/90] Fix bzr's ignore artificats in .gitignore
We lost a man page because of incompatibilities between bzr's ignore
system and .gitignore, so solve that slightly better.

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

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

2
0006-Move-bash-completion-script-922997.patch
View File

@ -1,7 +1,7 @@
From 5b77e510eb6e4b649c53ab0790cdc9fdf0c85be9 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 3 Apr 2013 14:35:34 -0400
Subject: [PATCH 06/89] Move bash completion script (#922997)
Subject: [PATCH 06/90] Move bash completion script (#922997)
Apparently these go in a new place now.
---

2
0007-Update-to-minilzo-2.08.patch
View File

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

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

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

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

@ -1,7 +1,7 @@
From 196ae5abd961cd64b60d9ab41bfc02d340e8bb6f Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Fri, 5 Sep 2014 10:07:04 -0400
Subject: [PATCH 09/89] Allow "fallback" to include entries by title, not just
Subject: [PATCH 09/90] Allow "fallback" to include entries by title, not just
number.
Resolves: rhbz#1026084

2
0010-Add-GRUB_DISABLE_UUID.patch
View File

@ -1,7 +1,7 @@
From 8f405e93871ad51cd9ab4dfdea844042a33fa7f0 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Thu, 4 Sep 2014 16:49:25 -0400
Subject: [PATCH 10/89] Add GRUB_DISABLE_UUID.
Subject: [PATCH 10/90] Add GRUB_DISABLE_UUID.
This will cause "search --fs-uuid --set=root ..." not to be generated by
grub2-mkconfig, and instead simply attempt to use the grub device name

2
0011-Make-exit-take-a-return-code.patch
View File

@ -1,7 +1,7 @@
From 6879936079d17ace35cebcab787f7fb9f8cd205e Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 26 Feb 2014 21:49:12 -0500
Subject: [PATCH 11/89] Make "exit" take a return code.
Subject: [PATCH 11/90] Make "exit" take a return code.
This adds "exit" with a return code. With this patch, any "exit"
command /may/ include a return code, and on platforms that support

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

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

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

@ -1,7 +1,7 @@
From e14c5369fea76d1e067ca9f7e5e55bfe615cb639 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 7 Dec 2015 14:20:49 -0500
Subject: [PATCH 13/89] Make efi machines load an env block from a variable
Subject: [PATCH 13/90] Make efi machines load an env block from a variable
Signed-off-by: Peter Jones <pjones@redhat.com>
---

2
0014-DHCP-client-ID-and-UUID-options-added.patch
View File

@ -1,7 +1,7 @@
From 12fb24b4d8a8f0fd7f79bc224157c290ebab31f4 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Tue, 27 Nov 2012 17:18:53 -0200
Subject: [PATCH 14/89] DHCP client ID and UUID options added.
Subject: [PATCH 14/90] DHCP client ID and UUID options added.
---
grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----

2
0015-trim-arp-packets-with-abnormal-size.patch
View File

@ -1,7 +1,7 @@
From a6f4624278357f853e3e8888e538eb0ef3654556 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Wed, 5 Feb 2014 09:42:42 -0200
Subject: [PATCH 15/89] trim arp packets with abnormal size
Subject: [PATCH 15/90] trim arp packets with abnormal size
GRUB uses arp request to create the arp response. If the incoming packet
is foobared, GRUB needs to trim the arp response packet before sending it.

2
0016-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
View File

@ -1,7 +1,7 @@
From c22139b340f1a306ad718646a4cd4bc1d4039d7b Mon Sep 17 00:00:00 2001
From: Prarit Bhargava <prarit@redhat.com>
Date: Wed, 12 Mar 2014 10:58:16 -0400
Subject: [PATCH 16/89] Fix bad test on GRUB_DISABLE_SUBMENU.
Subject: [PATCH 16/90] Fix bad test on GRUB_DISABLE_SUBMENU.
The file /etc/grub.d/10_linux does

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

@ -1,7 +1,7 @@
From f0daa044a90c508f8f60d23e5ef39597ec80c2cc Mon Sep 17 00:00:00 2001
From: Matthew Garrett <matthew.garrett@nebula.com>
Date: Wed, 12 Jun 2013 11:51:49 -0400
Subject: [PATCH 17/89] Add support for UEFI operating systems returned by
Subject: [PATCH 17/90] Add support for UEFI operating systems returned by
os-prober
os-prober returns UEFI operating systems in the form:

2
0018-Migrate-PPC-from-Yaboot-to-Grub2.patch
View File

@ -1,7 +1,7 @@
From 0e433858169473aa7a042c28dd6f0d4e1adab8d7 Mon Sep 17 00:00:00 2001
From: Mark Hamzy <hamzy@us.ibm.com>
Date: Wed, 28 Mar 2012 14:46:41 -0500
Subject: [PATCH 18/89] Migrate PPC from Yaboot to Grub2
Subject: [PATCH 18/90] Migrate PPC from Yaboot to Grub2
Add configuration support for serial terminal consoles. This will set the
maximum screen size so that text is not overwritten.

2
0019-Add-fw_path-variable-revised.patch
View File

@ -1,7 +1,7 @@
From fdc52554d998170f56ed45856082f4a3bfeb3e2a Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Wed, 19 Sep 2012 21:22:55 -0300
Subject: [PATCH 19/89] Add fw_path variable (revised)
Subject: [PATCH 19/90] Add fw_path variable (revised)
This patch makes grub look for its config file on efi where the app was
found. It was originally written by Matthew Garrett, and adapted to fix the

2
0020-Add-support-for-linuxefi.patch
View File

@ -1,7 +1,7 @@
From a64179016df64b72cc956fd6085ca3ed1a41baac Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg@redhat.com>
Date: Tue, 10 Jul 2012 11:58:52 -0400
Subject: [PATCH 20/89] Add support for linuxefi
Subject: [PATCH 20/90] Add support for linuxefi
---
grub-core/Makefile.core.def | 8 +

2
0021-Use-linuxefi-and-initrdefi-where-appropriate.patch
View File

@ -1,7 +1,7 @@
From 5894e3bfaf055554c786b4c1a9452d4e3bb9f568 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 16 Jul 2012 18:57:11 -0400
Subject: [PATCH 21/89] Use "linuxefi" and "initrdefi" where appropriate.
Subject: [PATCH 21/90] Use "linuxefi" and "initrdefi" where appropriate.
---
util/grub.d/10_linux.in | 18 ++++++++++++++++--

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

@ -1,7 +1,7 @@
From 9d70f7f9a356d965ed48963e2ead12af8de97615 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 23 Oct 2012 10:40:49 -0400
Subject: [PATCH 22/89] Don't allow insmod when secure boot is enabled.
Subject: [PATCH 22/90] Don't allow insmod when secure boot is enabled.
Hi,

2
0023-Pass-x-hex-hex-straight-through-unmolested.patch
View File

@ -1,7 +1,7 @@
From c2a19ee447623af8765254b87ff83cbb5b8253bc Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 1 Oct 2012 13:24:37 -0400
Subject: [PATCH 23/89] Pass "\x[[:hex:]][[:hex:]]" straight through
Subject: [PATCH 23/90] Pass "\x[[:hex:]][[:hex:]]" straight through
unmolested.
---

2
0024-Add-X-option-to-printf-functions.patch
View File

@ -1,7 +1,7 @@
From c482ec700b2ba4b1fabccaa5848cccae466d3a12 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Tue, 27 Nov 2012 16:58:39 -0200
Subject: [PATCH 24/89] Add %X option to printf functions.
Subject: [PATCH 24/90] Add %X option to printf functions.
---
grub-core/kern/misc.c | 7 +++++--

2
0025-Search-for-specific-config-file-for-netboot.patch
View File

@ -1,7 +1,7 @@
From 70a8c5e075d59ec13fdee4c3868b3862a8cd8aa4 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Tue, 27 Nov 2012 17:22:07 -0200
Subject: [PATCH 25/89] Search for specific config file for netboot
Subject: [PATCH 25/90] Search for specific config file for netboot
This patch implements a search for a specific configuration when the config
file is on a remoteserver. It uses the following order:

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

@ -1,7 +1,7 @@
From 8992c2812e1e914e803429314b9164a19af4398b Mon Sep 17 00:00:00 2001
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
Date: Tue, 22 Jan 2013 06:31:38 +0100
Subject: [PATCH 26/89] blscfg: add blscfg module to parse Boot Loader
Subject: [PATCH 26/90] blscfg: add blscfg module to parse Boot Loader
Specification snippets
http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec

2
0027-Don-t-write-messages-to-the-screen.patch
View File

@ -1,7 +1,7 @@
From 3e83ff704af9a967fa55d60cc3917bc4ccd85f32 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Wed, 15 May 2013 13:30:20 -0400
Subject: [PATCH 27/89] Don't write messages to the screen
Subject: [PATCH 27/90] Don't write messages to the screen
Writing messages to the screen before the menus or boot splash
happens so quickly it looks like something is wrong and isn't

2
0028-Don-t-print-GNU-GRUB-header.patch
View File

@ -1,7 +1,7 @@
From 9bd3d2fb49a6b8e3807ce7275876fd4b416545c9 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Wed, 15 May 2013 13:53:48 -0400
Subject: [PATCH 28/89] Don't print GNU GRUB header
Subject: [PATCH 28/90] Don't print GNU GRUB header
No one cares.
---

2
0029-Don-t-add-to-highlighted-row.patch
View File

@ -1,7 +1,7 @@
From dd2c80ddd0e5e57b33a9d06894225e629b1b8b5e Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Wed, 15 May 2013 17:49:45 -0400
Subject: [PATCH 29/89] Don't add '*' to highlighted row
Subject: [PATCH 29/90] Don't add '*' to highlighted row
It is already highlighted.
---

2
0030-Message-string-cleanups.patch
View File

@ -1,7 +1,7 @@
From 4cc90ad7d495b896e0b6b2677285ced8ce70cee1 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Fri, 7 Jun 2013 11:09:04 -0400
Subject: [PATCH 30/89] Message string cleanups
Subject: [PATCH 30/90] Message string cleanups
Make use of terminology consistent. Remove jargon.
---

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

@ -1,7 +1,7 @@
From ee01481e906071d01649b61925eaac0348f9a9a7 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Fri, 7 Jun 2013 14:08:23 -0400
Subject: [PATCH 31/89] Fix border spacing now that we aren't displaying it
Subject: [PATCH 31/90] Fix border spacing now that we aren't displaying it
---
grub-core/normal/menu_text.c | 6 +++---

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

@ -1,7 +1,7 @@
From 748c629f47f4191c66011646e010cdf5ab506b90 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Fri, 7 Jun 2013 14:08:49 -0400
Subject: [PATCH 32/89] Use the correct indentation for the term help text
Subject: [PATCH 32/90] Use the correct indentation for the term help text
That is consistent with the menu help text
---

2
0033-Indent-menu-entries.patch
View File

@ -1,7 +1,7 @@
From 93092c8a33db0cb36392c9684a60c12fbc823554 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Fri, 7 Jun 2013 14:30:55 -0400
Subject: [PATCH 33/89] Indent menu entries
Subject: [PATCH 33/90] Indent menu entries
---
grub-core/normal/menu_text.c | 3 ++-

2
0034-Fix-margins.patch
View File

@ -1,7 +1,7 @@
From ee7064d8667cf51d12f2cc5ead9b428446c563ad Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Fri, 7 Jun 2013 14:59:36 -0400
Subject: [PATCH 34/89] Fix margins
Subject: [PATCH 34/90] Fix margins
---
grub-core/normal/menu_text.c | 8 +++-----

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

@ -1,7 +1,7 @@
From 712f456d542ec913c4a5bc13f86443f79912cbf3 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Fri, 21 Jun 2013 14:44:08 -0400
Subject: [PATCH 35/89] Use -2 instead of -1 for our right-hand margin, so
Subject: [PATCH 35/90] Use -2 instead of -1 for our right-hand margin, so
linewrapping works (#976643).
Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>

2
0036-Use-linux16-when-appropriate-880840.patch
View File

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

2
0037-Enable-pager-by-default.-985860.patch
View File

@ -1,7 +1,7 @@
From 0b72348759eaec7d1d488e9788e724a2d48ce3f7 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 28 Oct 2013 10:09:27 -0400
Subject: [PATCH 37/89] Enable pager by default. (#985860)
Subject: [PATCH 37/90] Enable pager by default. (#985860)
Signed-off-by: Peter Jones <pjones@redhat.com>
---

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

@ -1,7 +1,7 @@
From 55d0f5f5fdecfab6c8439520491e08a0178bd5dc Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 28 Oct 2013 10:13:27 -0400
Subject: [PATCH 38/89] F10 doesn't work on serial, so don't tell the user to
Subject: [PATCH 38/90] F10 doesn't work on serial, so don't tell the user to
hit it (#987443)
Signed-off-by: Peter Jones <pjones@redhat.com>

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

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

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

@ -1,7 +1,7 @@
From fbd9d8969c059d6e5572b1acfa42ba48bc4299e2 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Wed, 15 May 2013 16:47:33 -0400
Subject: [PATCH 40/89] Don't draw a border around the menu
Subject: [PATCH 40/90] Don't draw a border around the menu
It looks cleaner without it.
---

2
0041-Use-the-standard-margin-for-the-timeout-string.patch
View File

@ -1,7 +1,7 @@
From 3aeba4760755b9b263ed4ba60dc0431352b63fe7 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Fri, 7 Jun 2013 10:52:32 -0400
Subject: [PATCH 41/89] Use the standard margin for the timeout string
Subject: [PATCH 41/90] Use the standard margin for the timeout string
So that it aligns with the other messages
---

2
0042-Add-.eh_frame-to-list-of-relocations-stripped.patch
View File

@ -1,7 +1,7 @@
From 333159a74035a726841c6c888f43d983a40ed959 Mon Sep 17 00:00:00 2001
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
Date: Mon, 13 Jan 2014 21:50:59 -0500
Subject: [PATCH 42/89] Add .eh_frame to list of relocations stripped
Subject: [PATCH 42/90] Add .eh_frame to list of relocations stripped
---
conf/Makefile.common | 2 +-

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

@ -1,7 +1,7 @@
From 5fa65416bae89efb88015e72cb21c28fe3833fc8 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 14 Jan 2014 13:12:23 -0500
Subject: [PATCH 43/89] Make 10_linux work with our changes for linux16 and
Subject: [PATCH 43/90] Make 10_linux work with our changes for linux16 and
linuxefi on aarch64
Signed-off-by: Peter Jones <pjones@redhat.com>

2
0044-Don-t-print-during-fdt-loading-method.patch
View File

@ -1,7 +1,7 @@
From e89fd78bb3f62064d930c82ad14cd490166d1a2c Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 14 Jan 2014 16:15:46 -0500
Subject: [PATCH 44/89] Don't print during fdt loading method.
Subject: [PATCH 44/90] Don't print during fdt loading method.
Signed-off-by: Peter Jones <pjones@redhat.com>
---

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

@ -1,7 +1,7 @@
From 7683e149c587abf2d35de11c39ddb0810572b2e4 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 30 Jun 2014 14:16:46 -0400
Subject: [PATCH 45/89] Don't munge raw spaces when we're doing our cmdline
Subject: [PATCH 45/90] Don't munge raw spaces when we're doing our cmdline
escaping (#923374)
Signed-off-by: Peter Jones <pjones@redhat.com>

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

@ -1,7 +1,7 @@
From 8a11a21d904e7e823ee6f17faedbf45a8e28044a Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 11 Feb 2014 11:14:50 -0500
Subject: [PATCH 46/89] Don't require a password to boot entries generated by
Subject: [PATCH 46/90] Don't require a password to boot entries generated by
grub-mkconfig.
When we set a password, we just want that to mean you can't /edit/ an entry.

2
0047-Don-t-emit-Booting-.-message.patch
View File

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

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

@ -1,7 +1,7 @@
From cce065ff19272aa908a293632a265211201d7237 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 4 Mar 2014 11:00:23 -0500
Subject: [PATCH 48/89] Replace a lot of man pages with slightly nicer ones.
Subject: [PATCH 48/90] Replace a lot of man pages with slightly nicer ones.
Replace a bunch of machine generated ones with ones that look nicer.
---

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

@ -1,7 +1,7 @@
From c28ddef07d11d790d89ee6ec8e3a8cc7e1aace0d Mon Sep 17 00:00:00 2001
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
Date: Wed, 19 Feb 2014 15:58:43 -0500
Subject: [PATCH 49/89] use fw_path prefix when fallback searching for grub
Subject: [PATCH 49/90] use fw_path prefix when fallback searching for grub
config
When PXE booting via UEFI firmware, grub was searching for grub.cfg

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

@ -1,7 +1,7 @@
From 82812e4ade82c9aa4f2e8f091b60b714ecfd82e5 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Thu, 6 Mar 2014 11:51:33 -0500
Subject: [PATCH 50/89] Try mac/guid/etc before grub.cfg on tftp config files.
Subject: [PATCH 50/90] Try mac/guid/etc before grub.cfg on tftp config files.
Signed-off-by: Peter Jones <pjones@redhat.com>
---

2
0051-Fix-convert-function-to-support-NVMe-devices.patch
View File

@ -1,7 +1,7 @@
From b954efc0812579f973031b24c68a2f593bd89ba1 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 18 Feb 2014 11:34:00 -0500
Subject: [PATCH 51/89] Fix convert function to support NVMe devices
Subject: [PATCH 51/90] Fix convert function to support NVMe devices
This is adapted from the patch at
https://bugzilla.redhat.com/show_bug.cgi?id=1019660 , which is against

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

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

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

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

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

@ -1,7 +1,7 @@
From e119353dad1eadc771a011f82bf90bd04fc00f9a Mon Sep 17 00:00:00 2001
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
Date: Sat, 15 Feb 2014 15:10:22 -0500
Subject: [PATCH 54/89] reopen SNP protocol for exclusive use by grub
Subject: [PATCH 54/90] reopen SNP protocol for exclusive use by grub
---
grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++

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

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

2
0056-Add-grub_util_readlink.patch
View File

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

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

@ -1,7 +1,7 @@
From a867dc42c711385634d86f04176cf3193d548f1d Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 3 Sep 2014 10:38:00 -0400
Subject: [PATCH 57/89] Make editenv chase symlinks including those across
Subject: [PATCH 57/90] Make editenv chase symlinks including those across
devices.
This lets us make /boot/grub2/grubenv a symlink to

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

@ -1,7 +1,7 @@
From 14b8db374bfc41fffa278ec33084324008384417 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Thu, 4 Sep 2014 14:23:23 -0400
Subject: [PATCH 58/89] Generate OS and CLASS in 10_linux from /etc/os-release
Subject: [PATCH 58/90] Generate OS and CLASS in 10_linux from /etc/os-release
This makes us use pretty names in the titles we generate in
grub2-mkconfig when GRUB_DISTRIBUTOR isn't set.

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

@ -1,7 +1,7 @@
From 700c631b4c887778951503346afe5b7ee70bf7dd Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Thu, 4 Sep 2014 15:52:08 -0400
Subject: [PATCH 59/89] Minimize the sort ordering for .debug and -rescue-
Subject: [PATCH 59/90] Minimize the sort ordering for .debug and -rescue-
kernels.
Resolves: rhbz#1065360

2
0060-Load-arm-with-SB-enabled.patch
View File

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

2
0061-Try-prefix-if-fw_path-doesn-t-work.patch
View File

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

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

@ -1,7 +1,7 @@
From 8e6fc0ea14aa01817cc9103ffd5e328a78e56857 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 27 Oct 2014 09:22:55 -0400
Subject: [PATCH 62/89] Try to emit linux16/initrd16 and linuxefi/initrdefi in
Subject: [PATCH 62/90] Try to emit linux16/initrd16 and linuxefi/initrdefi in
30-os_prober.
Resolves: rhbz#1108296

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

@ -1,7 +1,7 @@
From b6e3ffe7ae7e4222cc15876cb72c691112f3c4b0 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 28 Apr 2015 11:15:03 -0400
Subject: [PATCH 63/89] Make grub2-mkconfig construct titles that look like the
Subject: [PATCH 63/90] Make grub2-mkconfig construct titles that look like the
ones we want elsewhere.
Resolves: rhbz#1215839

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

@ -1,7 +1,7 @@
From c4be6106eae8c1b479c325f531a1f81188f400e8 Mon Sep 17 00:00:00 2001
From: Robert Marshall <rmarshall@redhat.com>
Date: Mon, 16 Mar 2015 16:34:51 -0400
Subject: [PATCH 64/89] Update info with grub.cfg netboot selection order
Subject: [PATCH 64/90] Update info with grub.cfg netboot selection order
(#1148650)
Added documentation to the grub info page that specifies the order

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

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

2
0066-Add-friendly-grub2-password-config-tool-985962.patch
View File

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

2
0067-Fix-race-in-EFI-validation.patch
View File

@ -1,7 +1,7 @@
From a605e7af01dc697021b96fe6fbaf92ef3fca017c Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59@coreos.com>
Date: Tue, 14 Jul 2015 16:58:51 -0700
Subject: [PATCH 67/89] Fix race in EFI validation
Subject: [PATCH 67/90] Fix race in EFI validation
---
grub-core/loader/i386/efi/linux.c | 44 ++++++++++-----------------------------

2
0068-ppc64le-sync-mkconfig-to-disk-1212114.patch
View File

@ -1,7 +1,7 @@
From 63efe6a207f59ffa9e55cc10a0aed272f3571227 Mon Sep 17 00:00:00 2001
From: Don Zickus <dzickus@redhat.com>
Date: Wed, 22 Jul 2015 13:59:55 -0400
Subject: [PATCH 68/89] ppc64le sync mkconfig to disk (#1212114)
Subject: [PATCH 68/90] ppc64le sync mkconfig to disk (#1212114)
If creating a new grub2 entry using grub2-mkconfig, the entry is not
immediately sync'd to disk. If a crash happens before the writeback,

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

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

2
0070-Add-secureboot-support-on-efi-chainloader.patch
View File

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

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

@ -1,7 +1,7 @@
From c1d31b6a26e5542142d569c94a70f1dc8e07afd6 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 6 Oct 2015 16:09:25 -0400
Subject: [PATCH 71/89] Make any of the loaders that link in efi mode honor
Subject: [PATCH 71/90] Make any of the loaders that link in efi mode honor
secure boot.
And in this case "honor" means "even if somebody does link this in, they

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

@ -1,7 +1,7 @@
From 5a0d703884a73f93a68753c6ed64bdf08797c82a Mon Sep 17 00:00:00 2001
From: Hector Marco-Gisbert <hecmargi@upv.es>
Date: Fri, 13 Nov 2015 16:21:09 +0100
Subject: [PATCH 72/89] Fix security issue when reading username and password
Subject: [PATCH 72/90] Fix security issue when reading username and password
This patch fixes two integer underflows at:
* grub-core/lib/crypto.c

2
0073-Make-grub_fatal-also-backtrace.patch
View File

@ -1,7 +1,7 @@
From c37a4f02e5fd0c3aa5f54baaeaf32eed0e3c110b Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 27 Jan 2016 09:22:42 -0500
Subject: [PATCH 73/89] Make grub_fatal() also backtrace.
Subject: [PATCH 73/90] Make grub_fatal() also backtrace.
---
grub-core/Makefile.core.def | 3 ++

2
0074-Rework-linux-command.patch
View File

@ -1,7 +1,7 @@
From 33d11870bbc2fa554fa9344c3c180279c258736a Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59@coreos.com>
Date: Sun, 9 Aug 2015 16:12:39 -0700
Subject: [PATCH 74/89] Rework linux command
Subject: [PATCH 74/90] Rework linux command
We want a single buffer that contains the entire kernel image in order to
perform a TPM measurement. Allocate one and copy the entire kernel into it

2
0075-Rework-linux16-command.patch
View File

@ -1,7 +1,7 @@
From 0b86b309de12b4f3ea920124faa60841ffedf472 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59@coreos.com>
Date: Sun, 9 Aug 2015 16:20:58 -0700
Subject: [PATCH 75/89] Rework linux16 command
Subject: [PATCH 75/90] Rework linux16 command
We want a single buffer that contains the entire kernel image in order to
perform a TPM measurement. Allocate one and copy the entire kernel int it

2
0076-Make-grub-editenv-build-again.patch
View File

@ -1,7 +1,7 @@
From edaa6c877917816d57603e26d660107c82ffbb5d Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Fri, 4 Mar 2016 16:29:13 -0500
Subject: [PATCH 76/89] Make grub-editenv build again.
Subject: [PATCH 76/90] Make grub-editenv build again.
36212460d3565b18439a3a8130b28e6c97702c6a split how some of the mkimage
utility functions are defined, and they wind up being linked into

2
0077-Fix-locale-issue-in-grub-setpassword-1294243.patch
View File

@ -1,7 +1,7 @@
From d2f552900d87b62ca0dbc740902d561bc32f32be Mon Sep 17 00:00:00 2001
From: Robert Marshall <rmarshall@redhat.com>
Date: Fri, 29 Jan 2016 17:34:02 -0500
Subject: [PATCH 77/89] Fix locale issue in grub-setpassword (#1294243)
Subject: [PATCH 77/90] Fix locale issue in grub-setpassword (#1294243)
A shell substitution was expecting non-translated output to grab the
hashed password and put it in the user.cfg file. Modified code to force

2
0078-Fix-up-some-man-pages-rpmdiff-noticed.patch
View File

@ -1,7 +1,7 @@
From 216188f920d3ade19626d6e8fe450cea2c427e53 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 23 Sep 2014 09:58:49 -0400
Subject: [PATCH 78/89] Fix up some man pages rpmdiff noticed.
Subject: [PATCH 78/90] Fix up some man pages rpmdiff noticed.
---
configure.ac | 2 ++

2
0079-Handle-rssd-storage-devices.patch
View File

@ -1,7 +1,7 @@
From 90e2d3fbb161d494cdfc0ad0da740a6a4f651d70 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 30 Jun 2015 15:50:41 -0400
Subject: [PATCH 79/89] Handle rssd storage devices.
Subject: [PATCH 79/90] Handle rssd storage devices.
Resolves: rhbz#1087962

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

@ -1,7 +1,7 @@
From f46e9b0378cfaced22f0de5e8061ddb0c6829ee8 Mon Sep 17 00:00:00 2001
From: Robert Marshall <rmarshall@redhat.com>
Date: Mon, 22 Feb 2016 15:30:05 -0500
Subject: [PATCH 80/89] Warn if grub password will not be read (#1290803)
Subject: [PATCH 80/90] Warn if grub password will not be read (#1290803)
It is possible for a system to have never run grub-mkconfig and add the
section that reads the user.cfg file which contains a user set GRUB

2
0081-Clean-up-grub-setpassword-documentation-1290799.patch
View File

@ -1,7 +1,7 @@
From f41adcd85164ef8a0d0918f0508f29dcf3c7467d Mon Sep 17 00:00:00 2001
From: Robert Marshall <rmarshall@redhat.com>
Date: Tue, 26 Jan 2016 10:28:35 -0500
Subject: [PATCH 81/89] Clean up grub-setpassword documentation (#1290799)
Subject: [PATCH 81/90] Clean up grub-setpassword documentation (#1290799)
The output for --help had some errors. Corrected those and polished the
text to be a little easier to follow. Carried verbage over to man page

2
0082-Re-work-some-intricacies-of-PE-loading.patch
View File

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

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

@ -1,7 +1,7 @@
From 8b4deb97529ba7ff689a11639f2a5bfdb29ad2ea Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Fri, 10 Jun 2016 14:06:15 -0400
Subject: [PATCH 83/89] Rework even more of efi chainload so non-sb cases work
Subject: [PATCH 83/90] Rework even more of efi chainload so non-sb cases work
right.
This ensures that if shim protocol is not loaded, or is loaded but shim

2
0084-linuxefi-fix-double-free-on-verification-failure.patch
View File

@ -1,7 +1,7 @@
From 0a3a4d0b69b5d68f3e4b6b74fe2e6b5d4dcace4f Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 14 Jun 2016 09:50:25 -0400
Subject: [PATCH 84/89] linuxefi: fix double free on verification failure.
Subject: [PATCH 84/90] linuxefi: fix double free on verification failure.
Signed-off-by: Peter Jones <pjones@redhat.com>
---

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

@ -1,7 +1,7 @@
From be4d338b0c086e9cbbd2d353cd88abad67c000c9 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 11 Jul 2016 13:36:45 -0400
Subject: [PATCH 85/89] fix machine type test in 30_os-prober.in
Subject: [PATCH 85/90] fix machine type test in 30_os-prober.in
Signed-off-by: Peter Jones <pjones@redhat.com>
---

2
0086-ppc64le-has-no-separate-boot-mount-1261926.patch
View File

@ -1,7 +1,7 @@
From 12a2215a6f13f2503a9e38d84fff64789c6a34b7 Mon Sep 17 00:00:00 2001
From: Robert Marshall <rmarshall@redhat.com>
Date: Fri, 17 Jun 2016 11:47:34 -0400
Subject: [PATCH 86/89] ppc64le has no separate /boot mount (#1261926)
Subject: [PATCH 86/90] ppc64le has no separate /boot mount (#1261926)
The patch for rhbz#1212114 ensures that ppc64le systems sync grub config
changes to disk prior to grub-mkconfig completion and a reboot.

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

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

2
0088-Normalize-slashes-in-tftp-paths.patch
View File

@ -1,7 +1,7 @@
From 22d26153c1d92b8a42d1ec823b7f7c77c1cc0a8c Mon Sep 17 00:00:00 2001
From: Lenny Szubowicz <lszubowi@redhat.com>
Date: Mon, 29 Aug 2016 11:04:48 -0400
Subject: [PATCH 88/89] Normalize slashes in tftp paths.
Subject: [PATCH 88/90] Normalize slashes in tftp paths.
Some tftp servers do not handle multiple consecutive slashes correctly;
this patch avoids sending tftp requests with non-normalized paths.

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

@ -1,7 +1,7 @@
From 54d9b46779dab340984dde1077c4f2b685caf0b1 Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek@redhat.com>
Date: Mon, 21 Nov 2016 15:34:00 +0100
Subject: [PATCH 89/89] efi/chainloader: fix wrong sanity check in
Subject: [PATCH 89/90] efi/chainloader: fix wrong sanity check in
relocate_coff()
In relocate_coff(), the relocation entries are parsed from the original

113
0090-efi-chainloader-truncate-overlong-relocation-section.patch Normal file
View File

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

1
grub.patches
View File

@ -88,3 +88,4 @@ Patch0086: 0086-ppc64le-has-no-separate-boot-mount-1261926.patch
Patch0087: 0087-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
Patch0088: 0088-Normalize-slashes-in-tftp-paths.patch
Patch0089: 0089-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch
Patch0090: 0090-efi-chainloader-truncate-overlong-relocation-section.patch

5
grub2.spec
View File

@ -45,7 +45,7 @@
Name: grub2
Epoch: 1
Version: 2.02
Release: 0.36%{?dist}
Release: 0.37%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base
@ -545,6 +545,9 @@ fi
%{_datarootdir}/grub/themes/starfield
%changelog
* Fri Dec 02 2016 pjones <pjones@redhat.com> - 1:2.02-0.37
- Rebased to newer upstream for fedora-26
* Thu Dec 01 2016 Peter Jones <pjones@redhat.com> - 2.02-0.36
- Update version to .36 because I already built an f25 one named 0.35