Rebased to newer upstream for fedora-26
Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones
parent
5c99bbbbf1
commit
475000b94d
@ -1,7 +1,7 @@
|
||||
From e32c57d2abd034cbdea24a8f51de8dbef453bd96 Mon Sep 17 00:00:00 2001
|
||||
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
||||
Date: Thu, 20 Sep 2012 18:07:39 -0300
|
||||
Subject: [PATCH 01/87] IBM client architecture (CAS) reboot support
|
||||
Subject: [PATCH 01/89] IBM client architecture (CAS) reboot support
|
||||
|
||||
This is an implementation of IBM client architecture (CAS) reboot for GRUB.
|
||||
|
||||
@ -170,5 +170,5 @@ index 8e42513..9f26c69 100644
|
||||
#define FOR_IEEE1275_DEVALIASES(alias) for (grub_ieee1275_devalias_init_iterator (&(alias)); grub_ieee1275_devalias_next (&(alias));)
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 4f82466e3b1fcf3370d82432e406f51906e1fa46 Mon Sep 17 00:00:00 2001
|
||||
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
||||
Date: Wed, 24 Apr 2013 10:51:48 -0300
|
||||
Subject: [PATCH 02/87] for ppc, reset console display attr when clear screen
|
||||
Subject: [PATCH 02/89] for ppc, reset console display attr when clear screen
|
||||
|
||||
v2: Also use \x0c instead of a literal ^L to make future patches less
|
||||
awkward.
|
||||
@ -28,5 +28,5 @@ index f0d3e3d..9bb75c1 100644
|
||||
data->reverse_video_off = grub_strdup ("\e[m");
|
||||
if (grub_strcmp ("ieee1275", str) == 0)
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 9cff6efa3a7e15a6968fed29a29f38713da864fd Mon Sep 17 00:00:00 2001
|
||||
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
||||
Date: Tue, 11 Jun 2013 15:14:05 -0300
|
||||
Subject: [PATCH 03/87] Disable GRUB video support for IBM power machines
|
||||
Subject: [PATCH 03/89] Disable GRUB video support for IBM power machines
|
||||
|
||||
Should fix the problem in bugzilla:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=973205
|
||||
@ -61,5 +61,5 @@ index 9f26c69..ab4f284 100644
|
||||
|
||||
extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 512fe6865738286c94f87da64ca6b475bc3e2f38 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Tue, 7 Jul 2015 10:13:14 -0400
|
||||
Subject: [PATCH 04/87] Fix bzr's ignore artificats in .gitignore
|
||||
Subject: [PATCH 04/89] Fix bzr's ignore artificats in .gitignore
|
||||
|
||||
We lost a man page because of incompatibilities between bzr's ignore
|
||||
system and .gitignore, so solve that slightly better.
|
||||
@ -367,5 +367,5 @@ index 18ab8e8..06c9f3a 100644
|
||||
-/grub-fs-tester
|
||||
+xzcompress_test
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 7f1ea377390345b8ef7609ad0fa2952708b17e19 Mon Sep 17 00:00:00 2001
|
||||
From: Marcel Kolaja <mkolaja@redhat.com>
|
||||
Date: Tue, 21 Jan 2014 10:57:08 -0500
|
||||
Subject: [PATCH 05/87] Honor a symlink when generating configuration by
|
||||
Subject: [PATCH 05/89] Honor a symlink when generating configuration by
|
||||
grub2-mkconfig
|
||||
|
||||
Honor a symlink when generating configuration by grub2-mkconfig, so that
|
||||
@ -25,5 +25,5 @@ index f8496d2..3b070fd 100644
|
||||
fi
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 5b77e510eb6e4b649c53ab0790cdc9fdf0c85be9 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Wed, 3 Apr 2013 14:35:34 -0400
|
||||
Subject: [PATCH 06/87] Move bash completion script (#922997)
|
||||
Subject: [PATCH 06/89] Move bash completion script (#922997)
|
||||
|
||||
Apparently these go in a new place now.
|
||||
---
|
||||
@ -51,5 +51,5 @@ index 136287c..61108f0 100644
|
||||
|
||||
$(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 579ecb682efc5221b4a13b8009af1731f5349912 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Thu, 4 Dec 2014 15:36:09 -0500
|
||||
Subject: [PATCH 07/87] Update to minilzo-2.08
|
||||
Subject: [PATCH 07/89] Update to minilzo-2.08
|
||||
|
||||
This fixes CVE-2014-4607 - lzo: lzo1x_decompress_safe() integer overflow
|
||||
|
||||
@ -8786,5 +8786,5 @@ index 74fefa9..7937454 100644
|
||||
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From de423b22780b0fd225a1ee476166777af29d53d0 Mon Sep 17 00:00:00 2001
|
||||
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
||||
Date: Tue, 30 Oct 2012 15:19:39 -0200
|
||||
Subject: [PATCH 08/87] Add vlan-tag support on IBM PPC machines
|
||||
Subject: [PATCH 08/89] Add vlan-tag support on IBM PPC machines
|
||||
|
||||
This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging allows
|
||||
multiple VLANs in a bridged network to share the same physical network link but
|
||||
@ -182,5 +182,5 @@ index 2192fa1..6ac9d72 100644
|
||||
+
|
||||
#endif /* ! GRUB_NET_HEADER */
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 196ae5abd961cd64b60d9ab41bfc02d340e8bb6f Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Fri, 5 Sep 2014 10:07:04 -0400
|
||||
Subject: [PATCH 09/87] Allow "fallback" to include entries by title, not just
|
||||
Subject: [PATCH 09/89] Allow "fallback" to include entries by title, not just
|
||||
number.
|
||||
|
||||
Resolves: rhbz#1026084
|
||||
@ -140,5 +140,5 @@ index 719e2fb..2e8a7bd 100644
|
||||
static int
|
||||
get_entry_number (grub_menu_t menu, const char *name)
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 8f405e93871ad51cd9ab4dfdea844042a33fa7f0 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Thu, 4 Sep 2014 16:49:25 -0400
|
||||
Subject: [PATCH 10/87] Add GRUB_DISABLE_UUID.
|
||||
Subject: [PATCH 10/89] Add GRUB_DISABLE_UUID.
|
||||
|
||||
This will cause "search --fs-uuid --set=root ..." not to be generated by
|
||||
grub2-mkconfig, and instead simply attempt to use the grub device name
|
||||
@ -95,5 +95,5 @@ index 60b31ca..cf35e41 100644
|
||||
else
|
||||
echo $device |sed 's, ,_,g'
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 6879936079d17ace35cebcab787f7fb9f8cd205e Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Wed, 26 Feb 2014 21:49:12 -0500
|
||||
Subject: [PATCH 11/87] Make "exit" take a return code.
|
||||
Subject: [PATCH 11/89] Make "exit" take a return code.
|
||||
|
||||
This adds "exit" with a return code. With this patch, any "exit"
|
||||
command /may/ include a return code, and on platforms that support
|
||||
@ -255,5 +255,5 @@ index 2a9f87c..0620814 100644
|
||||
grub_uint64_t d,
|
||||
grub_uint64_t *r);
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From ef756db92dd4f47ed4bb4aede86d33326b0b9188 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Wed, 22 Jul 2015 11:21:01 -0400
|
||||
Subject: [PATCH 12/87] Mark po/exclude.pot as binary so git won't try to diff
|
||||
Subject: [PATCH 12/89] Mark po/exclude.pot as binary so git won't try to diff
|
||||
nonprintables.
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
@ -18,5 +18,5 @@ index 0000000..33ffaa4
|
||||
@@ -0,0 +1 @@
|
||||
+po/exclude.pot binary
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From e14c5369fea76d1e067ca9f7e5e55bfe615cb639 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Mon, 7 Dec 2015 14:20:49 -0500
|
||||
Subject: [PATCH 13/87] Make efi machines load an env block from a variable
|
||||
Subject: [PATCH 13/89] Make efi machines load an env block from a variable
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
---
|
||||
@ -80,5 +80,5 @@ index e9c85de..a5b6c1d 100644
|
||||
char **path);
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 12fb24b4d8a8f0fd7f79bc224157c290ebab31f4 Mon Sep 17 00:00:00 2001
|
||||
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
||||
Date: Tue, 27 Nov 2012 17:18:53 -0200
|
||||
Subject: [PATCH 14/87] DHCP client ID and UUID options added.
|
||||
Subject: [PATCH 14/89] DHCP client ID and UUID options added.
|
||||
|
||||
---
|
||||
grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----
|
||||
@ -141,5 +141,5 @@ index 6ac9d72..96aa9fa 100644
|
||||
};
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From a6f4624278357f853e3e8888e538eb0ef3654556 Mon Sep 17 00:00:00 2001
|
||||
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
||||
Date: Wed, 5 Feb 2014 09:42:42 -0200
|
||||
Subject: [PATCH 15/87] trim arp packets with abnormal size
|
||||
Subject: [PATCH 15/89] trim arp packets with abnormal size
|
||||
|
||||
GRUB uses arp request to create the arp response. If the incoming packet
|
||||
is foobared, GRUB needs to trim the arp response packet before sending it.
|
||||
@ -27,5 +27,5 @@ index 4b68c41..f7c59d3 100644
|
||||
struct grub_net_buff nb_reply;
|
||||
struct arppkt *arp_reply;
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From c22139b340f1a306ad718646a4cd4bc1d4039d7b Mon Sep 17 00:00:00 2001
|
||||
From: Prarit Bhargava <prarit@redhat.com>
|
||||
Date: Wed, 12 Mar 2014 10:58:16 -0400
|
||||
Subject: [PATCH 16/87] Fix bad test on GRUB_DISABLE_SUBMENU.
|
||||
Subject: [PATCH 16/89] Fix bad test on GRUB_DISABLE_SUBMENU.
|
||||
|
||||
The file /etc/grub.d/10_linux does
|
||||
|
||||
@ -37,5 +37,5 @@ index de9044c..cf6331f 100644
|
||||
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From f0daa044a90c508f8f60d23e5ef39597ec80c2cc Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <matthew.garrett@nebula.com>
|
||||
Date: Wed, 12 Jun 2013 11:51:49 -0400
|
||||
Subject: [PATCH 17/87] Add support for UEFI operating systems returned by
|
||||
Subject: [PATCH 17/89] Add support for UEFI operating systems returned by
|
||||
os-prober
|
||||
|
||||
os-prober returns UEFI operating systems in the form:
|
||||
@ -46,5 +46,5 @@ index 515a68c..9b8f596 100644
|
||||
esac
|
||||
done
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 0e433858169473aa7a042c28dd6f0d4e1adab8d7 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Hamzy <hamzy@us.ibm.com>
|
||||
Date: Wed, 28 Mar 2012 14:46:41 -0500
|
||||
Subject: [PATCH 18/87] Migrate PPC from Yaboot to Grub2
|
||||
Subject: [PATCH 18/89] Migrate PPC from Yaboot to Grub2
|
||||
|
||||
Add configuration support for serial terminal consoles. This will set the
|
||||
maximum screen size so that text is not overwritten.
|
||||
@ -150,5 +150,5 @@ index 0000000..10d6658
|
||||
+ terminfo -g ${X}x${Y} ${TERMINAL}
|
||||
+EOF
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From fdc52554d998170f56ed45856082f4a3bfeb3e2a Mon Sep 17 00:00:00 2001
|
||||
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
||||
Date: Wed, 19 Sep 2012 21:22:55 -0300
|
||||
Subject: [PATCH 19/87] Add fw_path variable (revised)
|
||||
Subject: [PATCH 19/89] Add fw_path variable (revised)
|
||||
|
||||
This patch makes grub look for its config file on efi where the app was
|
||||
found. It was originally written by Matthew Garrett, and adapted to fix the
|
||||
@ -77,5 +77,5 @@ index 249e19b..759c475 100644
|
||||
prefix = grub_env_get ("prefix");
|
||||
if (prefix)
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From a64179016df64b72cc956fd6085ca3ed1a41baac Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg@redhat.com>
|
||||
Date: Tue, 10 Jul 2012 11:58:52 -0400
|
||||
Subject: [PATCH 20/87] Add support for linuxefi
|
||||
Subject: [PATCH 20/89] Add support for linuxefi
|
||||
|
||||
---
|
||||
grub-core/Makefile.core.def | 8 +
|
||||
@ -478,5 +478,5 @@ index da0ca3b..fc36bda 100644
|
||||
|
||||
/* Boot parameters for Linux based on 2.6.12. This is used by the setup
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 5894e3bfaf055554c786b4c1a9452d4e3bb9f568 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Mon, 16 Jul 2012 18:57:11 -0400
|
||||
Subject: [PATCH 21/87] Use "linuxefi" and "initrdefi" where appropriate.
|
||||
Subject: [PATCH 21/89] Use "linuxefi" and "initrdefi" where appropriate.
|
||||
|
||||
---
|
||||
util/grub.d/10_linux.in | 18 ++++++++++++++++--
|
||||
@ -46,5 +46,5 @@ index cf6331f..8ccf012 100644
|
||||
sed "s/^/$submenu_indentation/" << EOF
|
||||
}
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 9d70f7f9a356d965ed48963e2ead12af8de97615 Mon Sep 17 00:00:00 2001
|
||||
From: Colin Watson <cjwatson@ubuntu.com>
|
||||
Date: Tue, 23 Oct 2012 10:40:49 -0400
|
||||
Subject: [PATCH 22/87] Don't allow insmod when secure boot is enabled.
|
||||
Subject: [PATCH 22/89] Don't allow insmod when secure boot is enabled.
|
||||
|
||||
Hi,
|
||||
|
||||
@ -120,5 +120,5 @@ index 9a2da0e..2245632 100644
|
||||
EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,
|
||||
const grub_efi_device_path_t *dp2);
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From c2a19ee447623af8765254b87ff83cbb5b8253bc Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Mon, 1 Oct 2012 13:24:37 -0400
|
||||
Subject: [PATCH 23/87] Pass "\x[[:hex:]][[:hex:]]" straight through
|
||||
Subject: [PATCH 23/89] Pass "\x[[:hex:]][[:hex:]]" straight through
|
||||
unmolested.
|
||||
|
||||
---
|
||||
@ -179,5 +179,5 @@ index ab78ca8..cf6cd66 100644
|
||||
case '$':
|
||||
if (escaped)
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From c482ec700b2ba4b1fabccaa5848cccae466d3a12 Mon Sep 17 00:00:00 2001
|
||||
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
||||
Date: Tue, 27 Nov 2012 16:58:39 -0200
|
||||
Subject: [PATCH 24/87] Add %X option to printf functions.
|
||||
Subject: [PATCH 24/89] Add %X option to printf functions.
|
||||
|
||||
---
|
||||
grub-core/kern/misc.c | 7 +++++--
|
||||
@ -54,5 +54,5 @@ index 6bb0351..81be344 100644
|
||||
case 'd':
|
||||
{
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 70a8c5e075d59ec13fdee4c3868b3862a8cd8aa4 Mon Sep 17 00:00:00 2001
|
||||
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
||||
Date: Tue, 27 Nov 2012 17:22:07 -0200
|
||||
Subject: [PATCH 25/87] Search for specific config file for netboot
|
||||
Subject: [PATCH 25/89] Search for specific config file for netboot
|
||||
|
||||
This patch implements a search for a specific configuration when the config
|
||||
file is on a remoteserver. It uses the following order:
|
||||
@ -199,5 +199,5 @@ index 96aa9fa..e13ae1e 100644
|
||||
+
|
||||
#endif /* ! GRUB_NET_HEADER */
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 8992c2812e1e914e803429314b9164a19af4398b Mon Sep 17 00:00:00 2001
|
||||
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
|
||||
Date: Tue, 22 Jan 2013 06:31:38 +0100
|
||||
Subject: [PATCH 26/87] blscfg: add blscfg module to parse Boot Loader
|
||||
Subject: [PATCH 26/89] blscfg: add blscfg module to parse Boot Loader
|
||||
Specification snippets
|
||||
|
||||
http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec
|
||||
@ -247,5 +247,5 @@ index 0000000..4274aca
|
||||
+ grub_unregister_extcmd (cmd);
|
||||
+}
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 3e83ff704af9a967fa55d60cc3917bc4ccd85f32 Mon Sep 17 00:00:00 2001
|
||||
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||
Date: Wed, 15 May 2013 13:30:20 -0400
|
||||
Subject: [PATCH 27/87] Don't write messages to the screen
|
||||
Subject: [PATCH 27/89] Don't write messages to the screen
|
||||
|
||||
Writing messages to the screen before the menus or boot splash
|
||||
happens so quickly it looks like something is wrong and isn't
|
||||
@ -177,5 +177,5 @@ index 8ccf012..a3d9711 100644
|
||||
EOF
|
||||
fi
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 9bd3d2fb49a6b8e3807ce7275876fd4b416545c9 Mon Sep 17 00:00:00 2001
|
||||
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||
Date: Wed, 15 May 2013 13:53:48 -0400
|
||||
Subject: [PATCH 28/87] Don't print GNU GRUB header
|
||||
Subject: [PATCH 28/89] Don't print GNU GRUB header
|
||||
|
||||
No one cares.
|
||||
---
|
||||
@ -41,5 +41,5 @@ index b2654ef..f57b750 100644
|
||||
|
||||
static void
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From dd2c80ddd0e5e57b33a9d06894225e629b1b8b5e Mon Sep 17 00:00:00 2001
|
||||
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||
Date: Wed, 15 May 2013 17:49:45 -0400
|
||||
Subject: [PATCH 29/87] Don't add '*' to highlighted row
|
||||
Subject: [PATCH 29/89] Don't add '*' to highlighted row
|
||||
|
||||
It is already highlighted.
|
||||
---
|
||||
@ -22,5 +22,5 @@ index e22bb91..a3d1f23 100644
|
||||
grub_print_ucs4_menu (unicode_title,
|
||||
unicode_title + len,
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 4cc90ad7d495b896e0b6b2677285ced8ce70cee1 Mon Sep 17 00:00:00 2001
|
||||
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||
Date: Fri, 7 Jun 2013 11:09:04 -0400
|
||||
Subject: [PATCH 30/87] Message string cleanups
|
||||
Subject: [PATCH 30/89] Message string cleanups
|
||||
|
||||
Make use of terminology consistent. Remove jargon.
|
||||
---
|
||||
@ -67,5 +67,5 @@ index a3d1f23..64a8386 100644
|
||||
{
|
||||
grub_print_error ();
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From ee01481e906071d01649b61925eaac0348f9a9a7 Mon Sep 17 00:00:00 2001
|
||||
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||
Date: Fri, 7 Jun 2013 14:08:23 -0400
|
||||
Subject: [PATCH 31/87] Fix border spacing now that we aren't displaying it
|
||||
Subject: [PATCH 31/89] Fix border spacing now that we aren't displaying it
|
||||
|
||||
---
|
||||
grub-core/normal/menu_text.c | 6 +++---
|
||||
@ -28,5 +28,5 @@ index 64a8386..1062d64 100644
|
||||
geo->timeout_lines = 2;
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 748c629f47f4191c66011646e010cdf5ab506b90 Mon Sep 17 00:00:00 2001
|
||||
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||
Date: Fri, 7 Jun 2013 14:08:49 -0400
|
||||
Subject: [PATCH 32/87] Use the correct indentation for the term help text
|
||||
Subject: [PATCH 32/89] Use the correct indentation for the term help text
|
||||
|
||||
That is consistent with the menu help text
|
||||
---
|
||||
@ -24,5 +24,5 @@ index f57b750..0ce59fd 100644
|
||||
grub_print_message_indented (msg_formatted, 0, 0, term);
|
||||
grub_putcode ('\n', term);
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 93092c8a33db0cb36392c9684a60c12fbc823554 Mon Sep 17 00:00:00 2001
|
||||
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||
Date: Fri, 7 Jun 2013 14:30:55 -0400
|
||||
Subject: [PATCH 33/87] Indent menu entries
|
||||
Subject: [PATCH 33/89] Indent menu entries
|
||||
|
||||
---
|
||||
grub-core/normal/menu_text.c | 3 ++-
|
||||
@ -22,5 +22,5 @@ index 1062d64..ecc60f9 100644
|
||||
grub_print_ucs4_menu (unicode_title,
|
||||
unicode_title + len,
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From ee7064d8667cf51d12f2cc5ead9b428446c563ad Mon Sep 17 00:00:00 2001
|
||||
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||
Date: Fri, 7 Jun 2013 14:59:36 -0400
|
||||
Subject: [PATCH 34/87] Fix margins
|
||||
Subject: [PATCH 34/89] Fix margins
|
||||
|
||||
---
|
||||
grub-core/normal/menu_text.c | 8 +++-----
|
||||
@ -33,5 +33,5 @@ index ecc60f9..0e43f2c 100644
|
||||
- geo->timeout_lines /* timeout */
|
||||
- 1 /* empty final line */;
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 712f456d542ec913c4a5bc13f86443f79912cbf3 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Fri, 21 Jun 2013 14:44:08 -0400
|
||||
Subject: [PATCH 35/87] Use -2 instead of -1 for our right-hand margin, so
|
||||
Subject: [PATCH 35/89] Use -2 instead of -1 for our right-hand margin, so
|
||||
linewrapping works (#976643).
|
||||
|
||||
Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
|
||||
@ -23,5 +23,5 @@ index 0e43f2c..537d4bf 100644
|
||||
geo->first_entry_y = 3; /* three empty lines*/
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From aedb9655a10717fe3678a9e2fc720b55f5b0ffbc Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Mon, 28 Oct 2013 10:05:07 -0400
|
||||
Subject: [PATCH 36/87] Use linux16 when appropriate (#880840)
|
||||
Subject: [PATCH 36/89] Use linux16 when appropriate (#880840)
|
||||
|
||||
The kernel group really would prefer that we use the 16 bit entry point
|
||||
on x86 bios machines.
|
||||
@ -48,5 +48,5 @@ index a3d9711..f3bf6ac 100644
|
||||
fi
|
||||
fi
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 0b72348759eaec7d1d488e9788e724a2d48ce3f7 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Mon, 28 Oct 2013 10:09:27 -0400
|
||||
Subject: [PATCH 37/87] Enable pager by default. (#985860)
|
||||
Subject: [PATCH 37/89] Enable pager by default. (#985860)
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
---
|
||||
@ -22,5 +22,5 @@ index 93a9023..858b526 100644
|
||||
load_env
|
||||
fi
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 55d0f5f5fdecfab6c8439520491e08a0178bd5dc Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Mon, 28 Oct 2013 10:13:27 -0400
|
||||
Subject: [PATCH 38/87] F10 doesn't work on serial, so don't tell the user to
|
||||
Subject: [PATCH 38/89] F10 doesn't work on serial, so don't tell the user to
|
||||
hit it (#987443)
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
@ -23,5 +23,5 @@ index 537d4bf..452d55b 100644
|
||||
STANDARD_MARGIN, STANDARD_MARGIN,
|
||||
term, dry_run);
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From d110064c73c1604b07cdaa3d41751074b2701142 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Mon, 14 Mar 2011 14:27:42 -0400
|
||||
Subject: [PATCH 39/87] Don't say "GNU/Linux" in generated menus.
|
||||
Subject: [PATCH 39/89] Don't say "GNU/Linux" in generated menus.
|
||||
|
||||
---
|
||||
util/grub.d/10_linux.in | 4 ++--
|
||||
@ -41,5 +41,5 @@ index c48af94..25e3c41 100644
|
||||
fi
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From fbd9d8969c059d6e5572b1acfa42ba48bc4299e2 Mon Sep 17 00:00:00 2001
|
||||
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||
Date: Wed, 15 May 2013 16:47:33 -0400
|
||||
Subject: [PATCH 40/87] Don't draw a border around the menu
|
||||
Subject: [PATCH 40/89] Don't draw a border around the menu
|
||||
|
||||
It looks cleaner without it.
|
||||
---
|
||||
@ -70,5 +70,5 @@ index 452d55b..1ed2bd9 100644
|
||||
grub_term_highlight_color = old_color_highlight;
|
||||
geo->timeout_y = geo->first_entry_y + geo->num_entries
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 3aeba4760755b9b263ed4ba60dc0431352b63fe7 Mon Sep 17 00:00:00 2001
|
||||
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||
Date: Fri, 7 Jun 2013 10:52:32 -0400
|
||||
Subject: [PATCH 41/87] Use the standard margin for the timeout string
|
||||
Subject: [PATCH 41/89] Use the standard margin for the timeout string
|
||||
|
||||
So that it aligns with the other messages
|
||||
---
|
||||
@ -39,5 +39,5 @@ index 1ed2bd9..7681f7d 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 333159a74035a726841c6c888f43d983a40ed959 Mon Sep 17 00:00:00 2001
|
||||
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
|
||||
Date: Mon, 13 Jan 2014 21:50:59 -0500
|
||||
Subject: [PATCH 42/87] Add .eh_frame to list of relocations stripped
|
||||
Subject: [PATCH 42/89] Add .eh_frame to list of relocations stripped
|
||||
|
||||
---
|
||||
conf/Makefile.common | 2 +-
|
||||
@ -21,5 +21,5 @@ index 11296b5..a476ab5 100644
|
||||
CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding
|
||||
LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 5fa65416bae89efb88015e72cb21c28fe3833fc8 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Tue, 14 Jan 2014 13:12:23 -0500
|
||||
Subject: [PATCH 43/87] Make 10_linux work with our changes for linux16 and
|
||||
Subject: [PATCH 43/89] Make 10_linux work with our changes for linux16 and
|
||||
linuxefi on aarch64
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
@ -81,5 +81,5 @@ index ef52cf3..191aebe 100644
|
||||
for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
|
||||
if test -e "${i}" ; then
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From e89fd78bb3f62064d930c82ad14cd490166d1a2c Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Tue, 14 Jan 2014 16:15:46 -0500
|
||||
Subject: [PATCH 44/87] Don't print during fdt loading method.
|
||||
Subject: [PATCH 44/89] Don't print during fdt loading method.
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
---
|
||||
@ -23,5 +23,5 @@ index 191aebe..452a9f6 100644
|
||||
EOF
|
||||
fi
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 7683e149c587abf2d35de11c39ddb0810572b2e4 Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Mon, 30 Jun 2014 14:16:46 -0400
|
||||
Subject: [PATCH 45/87] Don't munge raw spaces when we're doing our cmdline
|
||||
Subject: [PATCH 45/89] Don't munge raw spaces when we're doing our cmdline
|
||||
escaping (#923374)
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
@ -32,5 +32,5 @@ index 0a5b2af..970ea86 100644
|
||||
{
|
||||
*buf++ = *c++;
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 8a11a21d904e7e823ee6f17faedbf45a8e28044a Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Tue, 11 Feb 2014 11:14:50 -0500
|
||||
Subject: [PATCH 46/87] Don't require a password to boot entries generated by
|
||||
Subject: [PATCH 46/89] Don't require a password to boot entries generated by
|
||||
grub-mkconfig.
|
||||
|
||||
When we set a password, we just want that to mean you can't /edit/ an entry.
|
||||
@ -27,5 +27,5 @@ index 452a9f6..79a747e 100644
|
||||
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
||||
OS="$(sed 's, release .*$,,g' /etc/system-release)"
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 5468ac6eef409220e59741ccf1073d92916cdddf Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Tue, 18 Feb 2014 09:37:49 -0500
|
||||
Subject: [PATCH 47/87] Don't emit "Booting ..." message.
|
||||
Subject: [PATCH 47/89] Don't emit "Booting ..." message.
|
||||
|
||||
UI team still hates this stuff, so we're disabling it for RHEL 7.
|
||||
|
||||
@ -48,5 +48,5 @@ index eeeee55..8349049 100644
|
||||
errs_before = grub_err_printed_errors;
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From cce065ff19272aa908a293632a265211201d7237 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Tue, 4 Mar 2014 11:00:23 -0500
|
||||
Subject: [PATCH 48/87] Replace a lot of man pages with slightly nicer ones.
|
||||
Subject: [PATCH 48/89] Replace a lot of man pages with slightly nicer ones.
|
||||
|
||||
Replace a bunch of machine generated ones with ones that look nicer.
|
||||
---
|
||||
@ -1959,5 +1959,5 @@ index 0000000..37ea2dd
|
||||
+.SH SEE ALSO
|
||||
+.BR "info grub"
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From c28ddef07d11d790d89ee6ec8e3a8cc7e1aace0d Mon Sep 17 00:00:00 2001
|
||||
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
|
||||
Date: Wed, 19 Feb 2014 15:58:43 -0500
|
||||
Subject: [PATCH 49/87] use fw_path prefix when fallback searching for grub
|
||||
Subject: [PATCH 49/89] use fw_path prefix when fallback searching for grub
|
||||
config
|
||||
|
||||
When PXE booting via UEFI firmware, grub was searching for grub.cfg
|
||||
@ -41,5 +41,5 @@ index 0ce59fd..a3713ef 100644
|
||||
{
|
||||
grub_size_t config_len;
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 82812e4ade82c9aa4f2e8f091b60b714ecfd82e5 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Thu, 6 Mar 2014 11:51:33 -0500
|
||||
Subject: [PATCH 50/87] Try mac/guid/etc before grub.cfg on tftp config files.
|
||||
Subject: [PATCH 50/89] Try mac/guid/etc before grub.cfg on tftp config files.
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
---
|
||||
@ -110,5 +110,5 @@ index a3713ef..7d9c4f0 100644
|
||||
else
|
||||
grub_enter_normal_mode (argv[0]);
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From b954efc0812579f973031b24c68a2f593bd89ba1 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Tue, 18 Feb 2014 11:34:00 -0500
|
||||
Subject: [PATCH 51/87] Fix convert function to support NVMe devices
|
||||
Subject: [PATCH 51/89] Fix convert function to support NVMe devices
|
||||
|
||||
This is adapted from the patch at
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1019660 , which is against
|
||||
@ -55,5 +55,5 @@ index 92c0d70..bf317a2 100644
|
||||
return grub_util_devmapper_part_to_disk (&st, is_part, os_dev);
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 6900527741a21097f57a72854944f3e078a0ee42 Mon Sep 17 00:00:00 2001
|
||||
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
|
||||
Date: Mon, 10 Feb 2014 16:13:10 -0500
|
||||
Subject: [PATCH 52/87] Switch to use APM Mustang device tree, for hardware
|
||||
Subject: [PATCH 52/89] Switch to use APM Mustang device tree, for hardware
|
||||
testing.
|
||||
|
||||
Signed-off-by: David A. Marlin <d.marlin@redhat.com>
|
||||
@ -25,5 +25,5 @@ index 79a747e..462b461 100644
|
||||
fi
|
||||
done
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 823290f622902f1ae06efa29efbe4ca15af1aafe Mon Sep 17 00:00:00 2001
|
||||
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
|
||||
Date: Wed, 12 Feb 2014 14:54:04 -0500
|
||||
Subject: [PATCH 53/87] Use the default device tree from the grub default file
|
||||
Subject: [PATCH 53/89] Use the default device tree from the grub default file
|
||||
|
||||
instead of hardcoding a value.
|
||||
|
||||
@ -41,5 +41,5 @@ index 462b461..a9692a0 100644
|
||||
fi
|
||||
done
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From e119353dad1eadc771a011f82bf90bd04fc00f9a Mon Sep 17 00:00:00 2001
|
||||
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
|
||||
Date: Sat, 15 Feb 2014 15:10:22 -0500
|
||||
Subject: [PATCH 54/87] reopen SNP protocol for exclusive use by grub
|
||||
Subject: [PATCH 54/89] reopen SNP protocol for exclusive use by grub
|
||||
|
||||
---
|
||||
grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++
|
||||
@ -42,5 +42,5 @@ index 5388f95..ea0e0ca 100644
|
||||
}
|
||||
}
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 5d47b56198754190c62179ae10ef175c00d1474d Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Fri, 4 Mar 2016 15:13:59 -0500
|
||||
Subject: [PATCH 55/87] Revert "reopen SNP protocol for exclusive use by grub"
|
||||
Subject: [PATCH 55/89] Revert "reopen SNP protocol for exclusive use by grub"
|
||||
|
||||
This reverts commit a3f2c756ce34c9666bddef35e3b3b85ccecdcffc , which is
|
||||
obsoleted by these:
|
||||
@ -50,5 +50,5 @@ index ea0e0ca..5388f95 100644
|
||||
}
|
||||
}
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 5a69c7fbfff14bcea80e781fcd6acad07c904e22 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Wed, 3 Sep 2014 10:01:03 -0400
|
||||
Subject: [PATCH 56/87] Add grub_util_readlink()
|
||||
Subject: [PATCH 56/89] Add grub_util_readlink()
|
||||
|
||||
Add grub_util_readlink(). This requires pulling in stat and readlink from
|
||||
gnulib, which pulls in stat and related headers, but after that the
|
||||
@ -3730,5 +3730,5 @@ index 0000000..9852778
|
||||
+ REPLACE_LOCALTIME=0; AC_SUBST([REPLACE_LOCALTIME])
|
||||
+])
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From a867dc42c711385634d86f04176cf3193d548f1d Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Wed, 3 Sep 2014 10:38:00 -0400
|
||||
Subject: [PATCH 57/87] Make editenv chase symlinks including those across
|
||||
Subject: [PATCH 57/89] Make editenv chase symlinks including those across
|
||||
devices.
|
||||
|
||||
This lets us make /boot/grub2/grubenv a symlink to
|
||||
@ -102,5 +102,5 @@ index c6f8d22..d8d1dad 100644
|
||||
+ free (rename_target);
|
||||
}
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 14b8db374bfc41fffa278ec33084324008384417 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Thu, 4 Sep 2014 14:23:23 -0400
|
||||
Subject: [PATCH 58/87] Generate OS and CLASS in 10_linux from /etc/os-release
|
||||
Subject: [PATCH 58/89] Generate OS and CLASS in 10_linux from /etc/os-release
|
||||
|
||||
This makes us use pretty names in the titles we generate in
|
||||
grub2-mkconfig when GRUB_DISTRIBUTOR isn't set.
|
||||
@ -28,5 +28,5 @@ index a9692a0..c662726 100644
|
||||
OS="${GRUB_DISTRIBUTOR}"
|
||||
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 700c631b4c887778951503346afe5b7ee70bf7dd Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Thu, 4 Sep 2014 15:52:08 -0400
|
||||
Subject: [PATCH 59/87] Minimize the sort ordering for .debug and -rescue-
|
||||
Subject: [PATCH 59/89] Minimize the sort ordering for .debug and -rescue-
|
||||
kernels.
|
||||
|
||||
Resolves: rhbz#1065360
|
||||
@ -30,5 +30,5 @@ index cf35e41..10fabee 100644
|
||||
version_test_numeric "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b"
|
||||
return "$?"
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From cae0d2cdb28017df75358e0839c60a9c2521cb82 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Thu, 18 Sep 2014 11:26:14 -0400
|
||||
Subject: [PATCH 60/87] Load arm with SB enabled.
|
||||
Subject: [PATCH 60/89] Load arm with SB enabled.
|
||||
|
||||
Make sure we actually try to validate secure boot on this platform (even
|
||||
though we're not shipping it enabled by default.)
|
||||
@ -424,5 +424,5 @@ index 0000000..d9ede36
|
||||
+
|
||||
+#endif /* ! GRUB_EFI_LINUX_HEADER */
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From d255a98813193eb2c23f9217106b121278843023 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Fri, 3 Oct 2014 11:08:03 -0400
|
||||
Subject: [PATCH 61/87] Try $prefix if $fw_path doesn't work.
|
||||
Subject: [PATCH 61/89] Try $prefix if $fw_path doesn't work.
|
||||
|
||||
Related: rhbz#1148652
|
||||
|
||||
@ -207,5 +207,5 @@ index 7d9c4f0..b69f9e7 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 8e6fc0ea14aa01817cc9103ffd5e328a78e56857 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Mon, 27 Oct 2014 09:22:55 -0400
|
||||
Subject: [PATCH 62/87] Try to emit linux16/initrd16 and linuxefi/initrdefi in
|
||||
Subject: [PATCH 62/89] Try to emit linux16/initrd16 and linuxefi/initrdefi in
|
||||
30-os_prober.
|
||||
|
||||
Resolves: rhbz#1108296
|
||||
@ -73,5 +73,5 @@ index 9b8f596..dc98eac 100644
|
||||
fi
|
||||
cat << EOF
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From b6e3ffe7ae7e4222cc15876cb72c691112f3c4b0 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Tue, 28 Apr 2015 11:15:03 -0400
|
||||
Subject: [PATCH 63/87] Make grub2-mkconfig construct titles that look like the
|
||||
Subject: [PATCH 63/89] Make grub2-mkconfig construct titles that look like the
|
||||
ones we want elsewhere.
|
||||
|
||||
Resolves: rhbz#1215839
|
||||
@ -50,5 +50,5 @@ index c662726..1215241 100644
|
||||
echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
||||
else
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From c4be6106eae8c1b479c325f531a1f81188f400e8 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Marshall <rmarshall@redhat.com>
|
||||
Date: Mon, 16 Mar 2015 16:34:51 -0400
|
||||
Subject: [PATCH 64/87] Update info with grub.cfg netboot selection order
|
||||
Subject: [PATCH 64/89] Update info with grub.cfg netboot selection order
|
||||
(#1148650)
|
||||
|
||||
Added documentation to the grub info page that specifies the order
|
||||
@ -66,5 +66,5 @@ index 98d4d0d..4c6323b 100644
|
||||
@samp{(tftp)} device.
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 11abe391636d0819902357591aebf0ea01b88130 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Marshall <rmarshall@redhat.com>
|
||||
Date: Mon, 16 Mar 2015 14:14:19 -0400
|
||||
Subject: [PATCH 65/87] Use Distribution Package Sort for grub2-mkconfig
|
||||
Subject: [PATCH 65/89] Use Distribution Package Sort for grub2-mkconfig
|
||||
(#1124074)
|
||||
|
||||
Users reported that newly installed kernels on their systems installed
|
||||
@ -456,5 +456,5 @@ index 0000000..f33bd1e
|
||||
+ return 0;
|
||||
+}
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From f7574b40f89ded29d82e5cfdb7494f8884bc1cdb Mon Sep 17 00:00:00 2001
|
||||
From: Robert Marshall <rmarshall@redhat.com>
|
||||
Date: Thu, 25 Jun 2015 11:13:11 -0400
|
||||
Subject: [PATCH 66/87] Add friendly grub2 password config tool (#985962)
|
||||
Subject: [PATCH 66/89] Add friendly grub2 password config tool (#985962)
|
||||
|
||||
Provided a tool for users to reset the grub2 root user password
|
||||
without having to alter the grub.cfg. The hashed password now
|
||||
@ -270,5 +270,5 @@ index 0000000..db2f44b
|
||||
+fi
|
||||
+EOF
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From a605e7af01dc697021b96fe6fbaf92ef3fca017c Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@coreos.com>
|
||||
Date: Tue, 14 Jul 2015 16:58:51 -0700
|
||||
Subject: [PATCH 67/87] Fix race in EFI validation
|
||||
Subject: [PATCH 67/89] Fix race in EFI validation
|
||||
|
||||
---
|
||||
grub-core/loader/i386/efi/linux.c | 44 ++++++++++-----------------------------
|
||||
@ -93,5 +93,5 @@ index e5b7785..7ccf32d 100644
|
||||
{
|
||||
grub_dl_unref (my_mod);
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 63efe6a207f59ffa9e55cc10a0aed272f3571227 Mon Sep 17 00:00:00 2001
|
||||
From: Don Zickus <dzickus@redhat.com>
|
||||
Date: Wed, 22 Jul 2015 13:59:55 -0400
|
||||
Subject: [PATCH 68/87] ppc64le sync mkconfig to disk (#1212114)
|
||||
Subject: [PATCH 68/89] ppc64le sync mkconfig to disk (#1212114)
|
||||
|
||||
If creating a new grub2 entry using grub2-mkconfig, the entry is not
|
||||
immediately sync'd to disk. If a crash happens before the writeback,
|
||||
@ -38,5 +38,5 @@ index fb87247..73a18f7 100644
|
||||
+ sync && mountpoint -q /boot &&fsfreeze -f /boot && fsfreeze -u /boot
|
||||
+fi
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 9d47b2c482b6db238c99fe106f4b2e3c612f3a91 Mon Sep 17 00:00:00 2001
|
||||
From: Raymund Will <rw@suse.com>
|
||||
Date: Fri, 10 Apr 2015 01:45:02 -0400
|
||||
Subject: [PATCH 69/87] Use device part of chainloader target, if present.
|
||||
Subject: [PATCH 69/89] Use device part of chainloader target, if present.
|
||||
|
||||
Otherwise chainloading is restricted to '$root', which might not even
|
||||
be readable by EFI!
|
||||
@ -33,5 +33,5 @@ index 522a716..6b47497 100644
|
||||
goto fail;
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 9cbf35d19f4ffafdf2683acf7b6a320b55bbdfca Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Tue, 6 Oct 2015 13:04:37 -0400
|
||||
Subject: [PATCH 70/87] Add secureboot support on efi chainloader
|
||||
Subject: [PATCH 70/89] Add secureboot support on efi chainloader
|
||||
|
||||
Expand the chainloader to be able to verify the image by means of shim
|
||||
lock protocol. The PE/COFF image is loaded and relocated by the
|
||||
@ -796,5 +796,5 @@ index f79c36c..f79782e 100644
|
||||
{
|
||||
grub_uint32_t page_rva;
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From c1d31b6a26e5542142d569c94a70f1dc8e07afd6 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Tue, 6 Oct 2015 16:09:25 -0400
|
||||
Subject: [PATCH 71/87] Make any of the loaders that link in efi mode honor
|
||||
Subject: [PATCH 71/89] Make any of the loaders that link in efi mode honor
|
||||
secure boot.
|
||||
|
||||
And in this case "honor" means "even if somebody does link this in, they
|
||||
@ -490,5 +490,5 @@ diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h
|
||||
new file mode 100644
|
||||
index 0000000..e69de29
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 5a0d703884a73f93a68753c6ed64bdf08797c82a Mon Sep 17 00:00:00 2001
|
||||
From: Hector Marco-Gisbert <hecmargi@upv.es>
|
||||
Date: Fri, 13 Nov 2015 16:21:09 +0100
|
||||
Subject: [PATCH 72/87] Fix security issue when reading username and password
|
||||
Subject: [PATCH 72/89] Fix security issue when reading username and password
|
||||
|
||||
This patch fixes two integer underflows at:
|
||||
* grub-core/lib/crypto.c
|
||||
@ -43,5 +43,5 @@ index 7338f82..6d6dc7d 100644
|
||||
if (cur_len)
|
||||
{
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From c37a4f02e5fd0c3aa5f54baaeaf32eed0e3c110b Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Wed, 27 Jan 2016 09:22:42 -0500
|
||||
Subject: [PATCH 73/87] Make grub_fatal() also backtrace.
|
||||
Subject: [PATCH 73/89] Make grub_fatal() also backtrace.
|
||||
|
||||
---
|
||||
grub-core/Makefile.core.def | 3 ++
|
||||
@ -171,5 +171,5 @@ index c3e03c7..c67273d 100644
|
||||
#include <grub/term.h>
|
||||
#include <grub/backtrace.h>
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 33d11870bbc2fa554fa9344c3c180279c258736a Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@coreos.com>
|
||||
Date: Sun, 9 Aug 2015 16:12:39 -0700
|
||||
Subject: [PATCH 74/87] Rework linux command
|
||||
Subject: [PATCH 74/89] Rework linux command
|
||||
|
||||
We want a single buffer that contains the entire kernel image in order to
|
||||
perform a TPM measurement. Allocate one and copy the entire kernel into it
|
||||
@ -103,5 +103,5 @@ index b0afcca..5eb7d17 100644
|
||||
grub_file_close (file);
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 0b86b309de12b4f3ea920124faa60841ffedf472 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@coreos.com>
|
||||
Date: Sun, 9 Aug 2015 16:20:58 -0700
|
||||
Subject: [PATCH 75/87] Rework linux16 command
|
||||
Subject: [PATCH 75/89] Rework linux16 command
|
||||
|
||||
We want a single buffer that contains the entire kernel image in order to
|
||||
perform a TPM measurement. Allocate one and copy the entire kernel int it
|
||||
@ -97,5 +97,5 @@ index 9128315..b864e54 100644
|
||||
grub_file_close (file);
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From edaa6c877917816d57603e26d660107c82ffbb5d Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Fri, 4 Mar 2016 16:29:13 -0500
|
||||
Subject: [PATCH 76/87] Make grub-editenv build again.
|
||||
Subject: [PATCH 76/89] Make grub-editenv build again.
|
||||
|
||||
36212460d3565b18439a3a8130b28e6c97702c6a split how some of the mkimage
|
||||
utility functions are defined, and they wind up being linked into
|
||||
@ -26,5 +26,5 @@ index 226c46b..8007de9 100644
|
||||
common = util/config.c;
|
||||
common = util/resolve.c;
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From d2f552900d87b62ca0dbc740902d561bc32f32be Mon Sep 17 00:00:00 2001
|
||||
From: Robert Marshall <rmarshall@redhat.com>
|
||||
Date: Fri, 29 Jan 2016 17:34:02 -0500
|
||||
Subject: [PATCH 77/87] Fix locale issue in grub-setpassword (#1294243)
|
||||
Subject: [PATCH 77/89] Fix locale issue in grub-setpassword (#1294243)
|
||||
|
||||
A shell substitution was expecting non-translated output to grab the
|
||||
hashed password and put it in the user.cfg file. Modified code to force
|
||||
@ -26,5 +26,5 @@ index dd76f00..2923f43 100644
|
||||
sed -e "s/PBKDF2 hash of your password is //"
|
||||
}
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 216188f920d3ade19626d6e8fe450cea2c427e53 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Tue, 23 Sep 2014 09:58:49 -0400
|
||||
Subject: [PATCH 78/87] Fix up some man pages rpmdiff noticed.
|
||||
Subject: [PATCH 78/89] Fix up some man pages rpmdiff noticed.
|
||||
|
||||
---
|
||||
configure.ac | 2 ++
|
||||
@ -149,5 +149,5 @@ index 0000000..8530948
|
||||
+.SH SEE ALSO
|
||||
+.BR "info grub"
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 90e2d3fbb161d494cdfc0ad0da740a6a4f651d70 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Tue, 30 Jun 2015 15:50:41 -0400
|
||||
Subject: [PATCH 79/87] Handle rssd storage devices.
|
||||
Subject: [PATCH 79/89] Handle rssd storage devices.
|
||||
|
||||
Resolves: rhbz#1087962
|
||||
|
||||
@ -35,5 +35,5 @@ index 09e7e6e..ad7b774 100644
|
||||
if ((strncmp ("loop", p, 4) == 0) && p[4] >= '0' && p[4] <= '9')
|
||||
{
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From f46e9b0378cfaced22f0de5e8061ddb0c6829ee8 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Marshall <rmarshall@redhat.com>
|
||||
Date: Mon, 22 Feb 2016 15:30:05 -0500
|
||||
Subject: [PATCH 80/87] Warn if grub password will not be read (#1290803)
|
||||
Subject: [PATCH 80/89] Warn if grub password will not be read (#1290803)
|
||||
|
||||
It is possible for a system to have never run grub-mkconfig and add the
|
||||
section that reads the user.cfg file which contains a user set GRUB
|
||||
@ -27,5 +27,5 @@ index 2923f43..dd7b793 100644
|
||||
+ echo "Update your configuration with @grub_mkconfig@ to support this feature."
|
||||
+fi
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From f41adcd85164ef8a0d0918f0508f29dcf3c7467d Mon Sep 17 00:00:00 2001
|
||||
From: Robert Marshall <rmarshall@redhat.com>
|
||||
Date: Tue, 26 Jan 2016 10:28:35 -0500
|
||||
Subject: [PATCH 81/87] Clean up grub-setpassword documentation (#1290799)
|
||||
Subject: [PATCH 81/89] Clean up grub-setpassword documentation (#1290799)
|
||||
|
||||
The output for --help had some errors. Corrected those and polished the
|
||||
text to be a little easier to follow. Carried verbage over to man page
|
||||
@ -54,5 +54,5 @@ index dd7b793..d7924af 100644
|
||||
Report bugs at https://bugzilla.redhat.com.
|
||||
EOF
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From e2b22111a8ec58091603fc785f54b1b998888735 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Thu, 9 Jun 2016 12:22:29 -0400
|
||||
Subject: [PATCH 82/87] Re-work some intricacies of PE loading.
|
||||
Subject: [PATCH 82/89] Re-work some intricacies of PE loading.
|
||||
|
||||
The PE spec is not a well written document, and awesomely every place
|
||||
where there's an ambiguous way to read something, Windows' bootmgfw.efi
|
||||
@ -349,5 +349,5 @@ index f79782e..8396bde 100644
|
||||
|
||||
struct grub_pe32_header
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 8b4deb97529ba7ff689a11639f2a5bfdb29ad2ea Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Fri, 10 Jun 2016 14:06:15 -0400
|
||||
Subject: [PATCH 83/87] Rework even more of efi chainload so non-sb cases work
|
||||
Subject: [PATCH 83/89] Rework even more of efi chainload so non-sb cases work
|
||||
right.
|
||||
|
||||
This ensures that if shim protocol is not loaded, or is loaded but shim
|
||||
@ -382,5 +382,5 @@ index d9ede36..0033d93 100644
|
||||
grub_err_t
|
||||
EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset,
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 0a3a4d0b69b5d68f3e4b6b74fe2e6b5d4dcace4f Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Tue, 14 Jun 2016 09:50:25 -0400
|
||||
Subject: [PATCH 84/87] linuxefi: fix double free on verification failure.
|
||||
Subject: [PATCH 84/89] linuxefi: fix double free on verification failure.
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
---
|
||||
@ -21,5 +21,5 @@ index 82f75b7..010bf98 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From be4d338b0c086e9cbbd2d353cd88abad67c000c9 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Mon, 11 Jul 2016 13:36:45 -0400
|
||||
Subject: [PATCH 85/87] fix machine type test in 30_os-prober.in
|
||||
Subject: [PATCH 85/89] fix machine type test in 30_os-prober.in
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
---
|
||||
@ -21,5 +21,5 @@ index dc98eac..e40274f 100644
|
||||
i?86|x86_64)
|
||||
sixteenbit="16"
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 12a2215a6f13f2503a9e38d84fff64789c6a34b7 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Marshall <rmarshall@redhat.com>
|
||||
Date: Fri, 17 Jun 2016 11:47:34 -0400
|
||||
Subject: [PATCH 86/87] ppc64le has no separate /boot mount (#1261926)
|
||||
Subject: [PATCH 86/89] ppc64le has no separate /boot mount (#1261926)
|
||||
|
||||
The patch for rhbz#1212114 ensures that ppc64le systems sync grub config
|
||||
changes to disk prior to grub-mkconfig completion and a reboot.
|
||||
@ -40,5 +40,5 @@ index 73a18f7..fb87247 100644
|
||||
- sync && mountpoint -q /boot &&fsfreeze -f /boot && fsfreeze -u /boot
|
||||
-fi
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From d3d42740661dce4df12330e57a1681a3b296622e Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Thu, 23 Jun 2016 11:01:39 -0400
|
||||
Subject: [PATCH 87/87] Add grub-get-kernel-settings and use it in 10_linux
|
||||
Subject: [PATCH 87/89] Add grub-get-kernel-settings and use it in 10_linux
|
||||
|
||||
This patch adds grub-get-kernel-settings, which reads the system kernel
|
||||
installation configuration from /etc/sysconfig/kernel, and outputs
|
||||
@ -298,5 +298,5 @@ index 1215241..0c5b227 100644
|
||||
fi
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.9.3
|
||||
|
||||
|
||||
58
0088-Normalize-slashes-in-tftp-paths.patch
Normal file
58
0088-Normalize-slashes-in-tftp-paths.patch
Normal file
@ -0,0 +1,58 @@
|
||||
From 22d26153c1d92b8a42d1ec823b7f7c77c1cc0a8c Mon Sep 17 00:00:00 2001
|
||||
From: Lenny Szubowicz <lszubowi@redhat.com>
|
||||
Date: Mon, 29 Aug 2016 11:04:48 -0400
|
||||
Subject: [PATCH 88/89] Normalize slashes in tftp paths.
|
||||
|
||||
Some tftp servers do not handle multiple consecutive slashes correctly;
|
||||
this patch avoids sending tftp requests with non-normalized paths.
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
---
|
||||
grub-core/net/tftp.c | 24 +++++++++++++++++++++++-
|
||||
1 file changed, 23 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
|
||||
index 7d90bf6..63bbc28 100644
|
||||
--- a/grub-core/net/tftp.c
|
||||
+++ b/grub-core/net/tftp.c
|
||||
@@ -300,6 +300,25 @@ destroy_pq (tftp_data_t data)
|
||||
grub_priority_queue_destroy (data->pq);
|
||||
}
|
||||
|
||||
+/* Create a normalized copy of the filename.
|
||||
+ Compress any string of consecutive forward slashes to a single forward
|
||||
+ slash. */
|
||||
+static void
|
||||
+grub_normalize_filename (char *normalized, const char *filename)
|
||||
+{
|
||||
+ char *dest = normalized;
|
||||
+ char *src = filename;
|
||||
+
|
||||
+ while (*src != '\0')
|
||||
+ {
|
||||
+ if (src[0] == '/' && src[1] == '/')
|
||||
+ src++;
|
||||
+ else
|
||||
+ *dest++ = *src++;
|
||||
+ }
|
||||
+ *dest = '\0';
|
||||
+}
|
||||
+
|
||||
static grub_err_t
|
||||
tftp_open (struct grub_file *file, const char *filename)
|
||||
{
|
||||
@@ -337,7 +356,10 @@ tftp_open (struct grub_file *file, const char *filename)
|
||||
rrqlen = 0;
|
||||
|
||||
tftph->opcode = grub_cpu_to_be16_compile_time (TFTP_RRQ);
|
||||
- grub_strcpy (rrq, filename);
|
||||
+
|
||||
+ /* Copy and normalize the filename to work-around issues on some tftp
|
||||
+ servers when file names are being matched for remapping. */
|
||||
+ grub_normalize_filename (rrq, filename);
|
||||
rrqlen += grub_strlen (filename) + 1;
|
||||
rrq += grub_strlen (filename) + 1;
|
||||
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
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
|
||||
relocate_coff()
|
||||
|
||||
In relocate_coff(), the relocation entries are parsed from the original
|
||||
image (not the section-wise copied image). The original image is
|
||||
pointed-to by the "orig" pointer. The current check
|
||||
|
||||
(void *)reloc_end < data
|
||||
|
||||
compares the addresses of independent memory allocations. "data" is a typo
|
||||
here, it should be "orig".
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1347291
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Tested-by: Bogdan Costescu <bcostescu@gmail.com>
|
||||
Tested-by: Juan Orti <j.orti.alcaine@gmail.com>
|
||||
---
|
||||
grub-core/loader/efi/chainloader.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
|
||||
index 49a7662..1bd7ffb 100644
|
||||
--- a/grub-core/loader/efi/chainloader.c
|
||||
+++ b/grub-core/loader/efi/chainloader.c
|
||||
@@ -397,7 +397,7 @@ relocate_coff (pe_coff_loader_image_context_t *context,
|
||||
reloc_end = (struct grub_pe32_fixup_block *)
|
||||
((char *)reloc_base + reloc_base->size);
|
||||
|
||||
- if ((void *)reloc_end < data || (void *)reloc_end > image_end)
|
||||
+ if ((void *)reloc_end < orig || (void *)reloc_end > image_end)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_ARGUMENT, "Reloc entry %d overflows binary",
|
||||
n);
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@ -86,3 +86,5 @@ Patch0084: 0084-linuxefi-fix-double-free-on-verification-failure.patch
|
||||
Patch0085: 0085-fix-machine-type-test-in-30_os-prober.in.patch
|
||||
Patch0086: 0086-ppc64le-has-no-separate-boot-mount-1261926.patch
|
||||
Patch0087: 0087-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
|
||||
Patch0088: 0088-Normalize-slashes-in-tftp-paths.patch
|
||||
Patch0089: 0089-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch
|
||||
|
||||
@ -551,6 +551,9 @@ fi
|
||||
%{_datarootdir}/grub/themes/starfield
|
||||
|
||||
%changelog
|
||||
* Thu Dec 01 2016 pjones <pjones@redhat.com> - 1:2.02-0.35
|
||||
- Rebased to newer upstream for fedora-26
|
||||
|
||||
* Thu Dec 01 2016 Peter Jones <pjones@redhat.com> - 2.02-0.34
|
||||
- Fix power6 makefile bits for newer autoconf defaults.
|
||||
- efi/chainloader: fix wrong sanity check in relocate_coff() (Laszlo Ersek)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user