From 2ae5c1ecf953ffb7685e96217730e220fc6e2019 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 4 Mar 2016 15:28:21 -0500 Subject: [PATCH] Rebased to newer upstream for fedora-24 Signed-off-by: Peter Jones --- 0001-Fix-crash-on-http.patch | 2 +- ...patch => 0002-Update-to-minilzo-2.08.patch | 4 +- ...config-now-returns-exit-code-1252311.patch | 10 +- ...HCP-client-ID-and-UUID-options-added.patch | 6 +- ...-trim-arp-packets-with-abnormal-size.patch | 4 +- ...vlan-tag-support-on-IBM-PPC-machines.patch | 18 ++-- ...ient-architecture-CAS-reboot-support.patch | 12 +-- ...nsole-display-attr-when-clear-screen.patch | 4 +- ...video-support-for-IBM-power-machines.patch | 4 +- ...UEFI-operating-systems-returned-by-o.patch | 4 +- ...es-load-an-env-block-from-a-variable.patch | 4 +- ...=> 0012-Make-exit-take-a-return-code.patch | 10 +- ...pot-as-binary-so-git-won-t-try-to-di.patch | 4 +- ...zr-s-ignore-artificats-in-.gitignore.patch | 4 +- ...d__-where-gcc-5.x-is-more-picky-abou.patch | 8 +- ...6-Move-bash-completion-script-922997.patch | 4 +- ...o-include-entries-by-title-not-just-.patch | 6 +- ...when-generating-configuration-by-gru.patch | 10 +- ...Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch | 4 +- ....patch => 0020-Add-GRUB_DISABLE_UUID.patch | 6 +- ...021-Add-X-option-to-printf-functions.patch | 6 +- 0022-Migrate-PPC-from-Yaboot-to-Grub2.patch | 4 +- 0023-Add-fw_path-variable-revised.patch | 4 +- 0024-Add-support-for-linuxefi.patch | 4 +- ...xefi-and-initrdefi-where-appropriate.patch | 4 +- ...w-insmod-when-secure-boot-is-enabled.patch | 4 +- ...-hex-hex-straight-through-unmolested.patch | 4 +- ...for-specific-config-file-for-netboot.patch | 4 +- ...g-module-to-parse-Boot-Loader-Specif.patch | 4 +- 0030-Don-t-write-messages-to-the-screen.patch | 4 +- 0031-Don-t-print-GNU-GRUB-header.patch | 4 +- 0032-Don-t-add-to-highlighted-row.patch | 4 +- 0033-Message-string-cleanups.patch | 4 +- ...ing-now-that-we-aren-t-displaying-it.patch | 4 +- ...t-indentation-for-the-term-help-text.patch | 4 +- 0036-Indent-menu-entries.patch | 4 +- 0037-Fix-margins.patch | 4 +- ...-1-for-our-right-hand-margin-so-line.patch | 4 +- ...-Use-linux16-when-appropriate-880840.patch | 4 +- 0040-Enable-pager-by-default.-985860.patch | 4 +- ...-on-serial-so-don-t-tell-the-user-to.patch | 4 +- ...n-t-say-GNU-Linux-in-generated-menus.patch | 4 +- ...-Don-t-draw-a-border-around-the-menu.patch | 4 +- ...andard-margin-for-the-timeout-string.patch | 4 +- ...rame-to-list-of-relocations-stripped.patch | 4 +- ...rk-with-our-changes-for-linux16-and-.patch | 4 +- ...on-t-print-during-fdt-loading-method.patch | 4 +- ...spaces-when-we-re-doing-our-cmdline-.patch | 4 +- ...password-to-boot-entries-generated-b.patch | 4 +- 0050-Don-t-emit-Booting-.-message.patch | 4 +- ...f-man-pages-with-slightly-nicer-ones.patch | 4 +- ...ix-when-fallback-searching-for-grub-.patch | 4 +- ...-before-grub.cfg-on-tftp-config-file.patch | 4 +- ...ert-function-to-support-NVMe-devices.patch | 4 +- ...M-Mustang-device-tree-for-hardware-t.patch | 4 +- ...device-tree-from-the-grub-default-fi.patch | 4 +- ...P-protocol-for-exclusive-use-by-grub.patch | 4 +- ...P-protocol-for-exclusive-use-by-grub.patch | 54 +++++++++++ ...patch => 0059-Add-grub_util_readlink.patch | 4 +- ...se-symlinks-including-those-across-d.patch | 4 +- ...CLASS-in-10_linux-from-etc-os-releas.patch | 4 +- ...t-ordering-for-.debug-and-rescue-ker.patch | 4 +- ...tch => 0063-Load-arm-with-SB-enabled.patch | 4 +- ...4-Try-prefix-if-fw_path-doesn-t-work.patch | 4 +- ...x16-initrd16-and-linuxefi-initrdefi-.patch | 4 +- ...fig-construct-titles-that-look-like-.patch | 4 +- ...-grub.cfg-netboot-selection-order-11.patch | 4 +- ...-Package-Sort-for-grub2-mkconfig-112.patch | 4 +- ...ly-grub2-password-config-tool-985962.patch | 4 +- ...h => 0070-Fix-race-in-EFI-validation.patch | 4 +- ...pc64le-sync-mkconfig-to-disk-1212114.patch | 4 +- ...art-of-chainloader-target-if-present.patch | 4 +- ...ecureboot-support-on-efi-chainloader.patch | 4 +- ...loaders-that-link-in-efi-mode-honor-.patch | 4 +- ...ue-when-reading-username-and-passwor.patch | 4 +- ... 0076-Make-grub_fatal-also-backtrace.patch | 4 +- ...pport.patch => 0077-Core-TPM-support.patch | 4 +- ....patch => 0078-Measure-kernel-initrd.patch | 4 +- ...ch => 0079-Add-BIOS-boot-measurement.patch | 4 +- ...d.patch => 0080-Rework-linux-command.patch | 4 +- ...patch => 0081-Rework-linux16-command.patch | 4 +- ...re-kernel-and-initrd-on-BIOS-systems.patch | 4 +- ... 0083-Measure-the-kernel-commandline.patch | 4 +- ...mands.patch => 0084-Measure-commands.patch | 4 +- ...Measure-multiboot-images-and-modules.patch | 4 +- grub.patches | 93 ++++++++++--------- grub2.spec | 6 +- 87 files changed, 296 insertions(+), 243 deletions(-) rename 0015-Update-to-minilzo-2.08.patch => 0002-Update-to-minilzo-2.08.patch (99%) rename 0021-Failed-config-now-returns-exit-code-1252311.patch => 0003-Failed-config-now-returns-exit-code-1252311.patch (71%) rename 0005-DHCP-client-ID-and-UUID-options-added.patch => 0004-DHCP-client-ID-and-UUID-options-added.patch (96%) rename 0011-trim-arp-packets-with-abnormal-size.patch => 0005-trim-arp-packets-with-abnormal-size.patch (89%) rename 0003-Add-vlan-tag-support.patch => 0006-Add-vlan-tag-support-on-IBM-PPC-machines.patch (91%) rename 0002-IBM-client-architecture-CAS-reboot-support.patch => 0007-IBM-client-architecture-CAS-reboot-support.patch (94%) rename 0007-for-ppc-reset-console-display-attr-when-clear-screen.patch => 0008-for-ppc-reset-console-display-attr-when-clear-screen.patch (89%) rename 0008-Add-support-for-UEFI-operating-systems-returned-by-o.patch => 0010-Add-support-for-UEFI-operating-systems-returned-by-o.patch (90%) rename 0020-Make-efi-machines-load-an-env-block-from-a-variable.patch => 0011-Make-efi-machines-load-an-env-block-from-a-variable.patch (94%) rename 0017-Make-exit-take-a-return-code.patch => 0012-Make-exit-take-a-return-code.patch (96%) rename 0019-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch => 0013-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch (76%) rename 0016-Fix-bzr-s-ignore-artificats-in-.gitignore.patch => 0014-Fix-bzr-s-ignore-artificats-in-.gitignore.patch (98%) rename 0018-Add-some-__unused__-where-gcc-5.x-is-more-picky-abou.patch => 0015-Add-some-__unused__-where-gcc-5.x-is-more-picky-abou.patch (91%) rename 0006-Move-bash-completion-script-922997.patch => 0016-Move-bash-completion-script-922997.patch (86%) rename 0014-Allow-fallback-to-include-entries-by-title-not-just-.patch => 0017-Allow-fallback-to-include-entries-by-title-not-just-.patch (95%) rename 0010-Honor-a-symlink-when-generating-configuration-by-gru.patch => 0018-Honor-a-symlink-when-generating-configuration-by-gru.patch (74%) rename 0012-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch => 0019-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch (90%) rename 0013-Add-GRUB_DISABLE_UUID.patch => 0020-Add-GRUB_DISABLE_UUID.patch (96%) rename 0004-Add-X-option-to-printf-functions.patch => 0021-Add-X-option-to-printf-functions.patch (90%) create mode 100644 0058-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch rename 0058-Add-grub_util_readlink.patch => 0059-Add-grub_util_readlink.patch (99%) rename 0059-Make-editenv-chase-symlinks-including-those-across-d.patch => 0060-Make-editenv-chase-symlinks-including-those-across-d.patch (95%) rename 0060-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch => 0061-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch (89%) rename 0061-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch => 0062-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch (89%) rename 0062-Load-arm-with-SB-enabled.patch => 0063-Load-arm-with-SB-enabled.patch (99%) rename 0063-Try-prefix-if-fw_path-doesn-t-work.patch => 0064-Try-prefix-if-fw_path-doesn-t-work.patch (97%) rename 0064-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch => 0065-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch (94%) rename 0065-Make-grub2-mkconfig-construct-titles-that-look-like-.patch => 0066-Make-grub2-mkconfig-construct-titles-that-look-like-.patch (94%) rename 0066-Update-info-with-grub.cfg-netboot-selection-order-11.patch => 0067-Update-info-with-grub.cfg-netboot-selection-order-11.patch (94%) rename 0067-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch => 0068-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch (98%) rename 0068-Add-friendly-grub2-password-config-tool-985962.patch => 0069-Add-friendly-grub2-password-config-tool-985962.patch (98%) rename 0069-Fix-race-in-EFI-validation.patch => 0070-Fix-race-in-EFI-validation.patch (95%) rename 0070-ppc64le-sync-mkconfig-to-disk-1212114.patch => 0071-ppc64le-sync-mkconfig-to-disk-1212114.patch (90%) rename 0071-Use-device-part-of-chainloader-target-if-present.patch => 0072-Use-device-part-of-chainloader-target-if-present.patch (89%) rename 0072-Add-secureboot-support-on-efi-chainloader.patch => 0073-Add-secureboot-support-on-efi-chainloader.patch (99%) rename 0073-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch => 0074-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch (99%) rename 0074-Fix-security-issue-when-reading-username-and-passwor.patch => 0075-Fix-security-issue-when-reading-username-and-passwor.patch (89%) rename 0075-Make-grub_fatal-also-backtrace.patch => 0076-Make-grub_fatal-also-backtrace.patch (97%) rename 0076-Core-TPM-support.patch => 0077-Core-TPM-support.patch (99%) rename 0077-Measure-kernel-initrd.patch => 0078-Measure-kernel-initrd.patch (92%) rename 0078-Add-BIOS-boot-measurement.patch => 0079-Add-BIOS-boot-measurement.patch (97%) rename 0079-Rework-linux-command.patch => 0080-Rework-linux-command.patch (96%) rename 0080-Rework-linux16-command.patch => 0081-Rework-linux16-command.patch (96%) rename 0081-Measure-kernel-and-initrd-on-BIOS-systems.patch => 0082-Measure-kernel-and-initrd-on-BIOS-systems.patch (94%) rename 0082-Measure-the-kernel-commandline.patch => 0083-Measure-the-kernel-commandline.patch (89%) rename 0083-Measure-commands.patch => 0084-Measure-commands.patch (95%) rename 0084-Measure-multiboot-images-and-modules.patch => 0085-Measure-multiboot-images-and-modules.patch (94%) diff --git a/0001-Fix-crash-on-http.patch b/0001-Fix-crash-on-http.patch index be83cc9c..a6e65801 100644 --- a/0001-Fix-crash-on-http.patch +++ b/0001-Fix-crash-on-http.patch @@ -1,7 +1,7 @@ From bf4d21655b4331c9f01e0ccca30a736e0503ce71 Mon Sep 17 00:00:00 2001 From: Gustavo Luiz Duarte Date: Tue, 25 Sep 2012 18:40:55 -0400 -Subject: [PATCH 01/84] Fix crash on http +Subject: [PATCH 01/85] Fix crash on http Don't free file->data on receiving FIN flag since it is used all over without checking. http_close() will be called later to free that memory. diff --git a/0015-Update-to-minilzo-2.08.patch b/0002-Update-to-minilzo-2.08.patch similarity index 99% rename from 0015-Update-to-minilzo-2.08.patch rename to 0002-Update-to-minilzo-2.08.patch index 3424ad1e..6b09f08a 100644 --- a/0015-Update-to-minilzo-2.08.patch +++ b/0002-Update-to-minilzo-2.08.patch @@ -1,7 +1,7 @@ -From da7fd8c2503c4d5d5c605a5ff25fb50d30476f75 Mon Sep 17 00:00:00 2001 +From 78b35097d8647b555deb8ece7ef141587529923d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Dec 2014 15:36:09 -0500 -Subject: [PATCH 15/84] Update to minilzo-2.08 +Subject: [PATCH 02/85] Update to minilzo-2.08 This fixes CVE-2014-4607 - lzo: lzo1x_decompress_safe() integer overflow diff --git a/0021-Failed-config-now-returns-exit-code-1252311.patch b/0003-Failed-config-now-returns-exit-code-1252311.patch similarity index 71% rename from 0021-Failed-config-now-returns-exit-code-1252311.patch rename to 0003-Failed-config-now-returns-exit-code-1252311.patch index 18ddd959..2373354f 100644 --- a/0021-Failed-config-now-returns-exit-code-1252311.patch +++ b/0003-Failed-config-now-returns-exit-code-1252311.patch @@ -1,7 +1,7 @@ -From f2ca800cfbbab4f59394a9f8304e74257d789a76 Mon Sep 17 00:00:00 2001 +From eaa05aa39e24bff667f48310871f64f367a78e3b Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Fri, 29 Jan 2016 14:49:24 -0500 -Subject: [PATCH 21/84] Failed config now returns exit code (#1252311) +Subject: [PATCH 03/85] Failed config now returns exit code (#1252311) Grub would notify the user if the new config was invalid, however, it did not exit properly with exit code 1. Added the proper exit code. @@ -12,17 +12,17 @@ Resolves: rhbz#1252311 1 file changed, 1 insertion(+) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index e576c98..c088b70 100644 +index 203b076..f8496d2 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in -@@ -281,6 +281,7 @@ Ensure that there are no errors in /etc/default/grub +@@ -273,6 +273,7 @@ Ensure that there are no errors in /etc/default/grub and /etc/grub.d/* files or please file a bug report with %s file attached." "${grub_cfg}.new" >&2 echo >&2 + exit 1 else # none of the children aborted with error, install the new grub.cfg - cat ${grub_cfg}.new > ${grub_cfg} + mv -f ${grub_cfg}.new ${grub_cfg} -- 2.5.0 diff --git a/0005-DHCP-client-ID-and-UUID-options-added.patch b/0004-DHCP-client-ID-and-UUID-options-added.patch similarity index 96% rename from 0005-DHCP-client-ID-and-UUID-options-added.patch rename to 0004-DHCP-client-ID-and-UUID-options-added.patch index 5a05cf67..b4c55f21 100644 --- a/0005-DHCP-client-ID-and-UUID-options-added.patch +++ b/0004-DHCP-client-ID-and-UUID-options-added.patch @@ -1,7 +1,7 @@ -From 49db632e0f365fe9da225729724aa33b2d82ca00 Mon Sep 17 00:00:00 2001 +From 836b528eed2671f3014f4d0983377ca69dc0fec1 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 17:18:53 -0200 -Subject: [PATCH 05/84] DHCP client ID and UUID options added. +Subject: [PATCH 04/85] DHCP client ID and UUID options added. --- grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++----- @@ -128,7 +128,7 @@ index a088244..4532177 100644 grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)), int argc, char **args) diff --git a/include/grub/net.h b/include/grub/net.h -index 6ac9d72..96aa9fa 100644 +index 2192fa1..4dc066a 100644 --- a/include/grub/net.h +++ b/include/grub/net.h @@ -456,6 +456,8 @@ enum diff --git a/0011-trim-arp-packets-with-abnormal-size.patch b/0005-trim-arp-packets-with-abnormal-size.patch similarity index 89% rename from 0011-trim-arp-packets-with-abnormal-size.patch rename to 0005-trim-arp-packets-with-abnormal-size.patch index ff1ec17d..a9f90fca 100644 --- a/0011-trim-arp-packets-with-abnormal-size.patch +++ b/0005-trim-arp-packets-with-abnormal-size.patch @@ -1,7 +1,7 @@ -From d0f918f39cc44c3e99697b3c6707c13412bd3f4b Mon Sep 17 00:00:00 2001 +From eb1adf51b18aaa62078bddf91439ca054b6f7965 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 5 Feb 2014 09:42:42 -0200 -Subject: [PATCH 11/84] trim arp packets with abnormal size +Subject: [PATCH 05/85] 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. diff --git a/0003-Add-vlan-tag-support.patch b/0006-Add-vlan-tag-support-on-IBM-PPC-machines.patch similarity index 91% rename from 0003-Add-vlan-tag-support.patch rename to 0006-Add-vlan-tag-support-on-IBM-PPC-machines.patch index 24b63766..292e58a5 100644 --- a/0003-Add-vlan-tag-support.patch +++ b/0006-Add-vlan-tag-support-on-IBM-PPC-machines.patch @@ -1,7 +1,7 @@ -From 1ca05028fd97aff0bf06049340a7cc00c88ca442 Mon Sep 17 00:00:00 2001 +From beee9fcaeb35cf95c6bcf272034d691235542121 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 30 Oct 2012 15:19:39 -0200 -Subject: [PATCH 03/84] Add vlan-tag support +Subject: [PATCH 06/85] 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 @@ -32,7 +32,7 @@ index 1259022..5fa26e1 100644 ptr = canon + grub_strlen (canon) - 1; while (ptr > canon && (*ptr == ',' || *ptr == ':')) diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c -index 6db8b98..81276fa 100644 +index ddb7783..5c12157 100644 --- a/grub-core/kern/ieee1275/openfw.c +++ b/grub-core/kern/ieee1275/openfw.c @@ -23,6 +23,7 @@ @@ -159,22 +159,22 @@ index c397b1b..faaca67 100644 return err; diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h -index 9f26c69..6a21f5d 100644 +index 8e42513..6d4e7d5 100644 --- a/include/grub/ieee1275/ieee1275.h +++ b/include/grub/ieee1275/ieee1275.h -@@ -236,6 +236,7 @@ void EXPORT_FUNC(grub_ieee1275_children_first) (const char *devpath, +@@ -234,6 +234,7 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali + void EXPORT_FUNC(grub_ieee1275_children_peer) (struct grub_ieee1275_devalias *alias); + void EXPORT_FUNC(grub_ieee1275_children_first) (const char *devpath, struct grub_ieee1275_devalias *alias); - int EXPORT_FUNC(grub_ieee1275_cas_reboot) (char *script); - int EXPORT_FUNC(grub_ieee1275_set_boot_last_label) (const char *text); +int EXPORT_FUNC(grub_ieee1275_parse_net_options) (const char *path); #define FOR_IEEE1275_DEVALIASES(alias) for (grub_ieee1275_devalias_init_iterator (&(alias)); grub_ieee1275_devalias_next (&(alias));) diff --git a/include/grub/net.h b/include/grub/net.h -index 2192fa1..6ac9d72 100644 +index 4dc066a..96aa9fa 100644 --- a/include/grub/net.h +++ b/include/grub/net.h -@@ -561,4 +561,6 @@ extern char *grub_net_default_server; +@@ -563,4 +563,6 @@ extern char *grub_net_default_server; #define GRUB_NET_INTERVAL 400 #define GRUB_NET_INTERVAL_ADDITION 20 diff --git a/0002-IBM-client-architecture-CAS-reboot-support.patch b/0007-IBM-client-architecture-CAS-reboot-support.patch similarity index 94% rename from 0002-IBM-client-architecture-CAS-reboot-support.patch rename to 0007-IBM-client-architecture-CAS-reboot-support.patch index e9abf04e..78066750 100644 --- a/0002-IBM-client-architecture-CAS-reboot-support.patch +++ b/0007-IBM-client-architecture-CAS-reboot-support.patch @@ -1,7 +1,7 @@ -From f98bbe1c2072c2da29e7a9e963cae6a668a8b7c8 Mon Sep 17 00:00:00 2001 +From 93a6fae012cadae03cbf81ebf82ae17894026e2c Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Thu, 20 Sep 2012 18:07:39 -0300 -Subject: [PATCH 02/84] IBM client architecture (CAS) reboot support +Subject: [PATCH 07/85] IBM client architecture (CAS) reboot support This is an implementation of IBM client architecture (CAS) reboot for GRUB. @@ -25,10 +25,10 @@ parameters 4 files changed, 90 insertions(+) diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c -index ddb7783..6db8b98 100644 +index 5c12157..81276fa 100644 --- a/grub-core/kern/ieee1275/openfw.c +++ b/grub-core/kern/ieee1275/openfw.c -@@ -561,3 +561,65 @@ grub_ieee1275_canonicalise_devname (const char *path) +@@ -591,3 +591,65 @@ grub_ieee1275_canonicalise_devname (const char *path) return NULL; } @@ -157,7 +157,7 @@ index a8502d9..ab78ca8 100644 { char *line; diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h -index 8e42513..9f26c69 100644 +index 6d4e7d5..6a21f5d 100644 --- a/include/grub/ieee1275/ieee1275.h +++ b/include/grub/ieee1275/ieee1275.h @@ -234,6 +234,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali @@ -166,9 +166,9 @@ index 8e42513..9f26c69 100644 struct grub_ieee1275_devalias *alias); +int EXPORT_FUNC(grub_ieee1275_cas_reboot) (char *script); +int EXPORT_FUNC(grub_ieee1275_set_boot_last_label) (const char *text); + int EXPORT_FUNC(grub_ieee1275_parse_net_options) (const char *path); #define FOR_IEEE1275_DEVALIASES(alias) for (grub_ieee1275_devalias_init_iterator (&(alias)); grub_ieee1275_devalias_next (&(alias));) - -- 2.5.0 diff --git a/0007-for-ppc-reset-console-display-attr-when-clear-screen.patch b/0008-for-ppc-reset-console-display-attr-when-clear-screen.patch similarity index 89% rename from 0007-for-ppc-reset-console-display-attr-when-clear-screen.patch rename to 0008-for-ppc-reset-console-display-attr-when-clear-screen.patch index e9f329b4..dbd56e9a 100644 --- a/0007-for-ppc-reset-console-display-attr-when-clear-screen.patch +++ b/0008-for-ppc-reset-console-display-attr-when-clear-screen.patch @@ -1,7 +1,7 @@ -From f3ead07820e443965aac5e6b4bdf9bdc45263a50 Mon Sep 17 00:00:00 2001 +From 297d32d320c94cdea94d8be4d06e6c574a5221f3 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 24 Apr 2013 10:51:48 -0300 -Subject: [PATCH 07/84] for ppc, reset console display attr when clear screen +Subject: [PATCH 08/85] for ppc, reset console display attr when clear screen This should fix this bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=908519 diff --git a/0009-Disable-GRUB-video-support-for-IBM-power-machines.patch b/0009-Disable-GRUB-video-support-for-IBM-power-machines.patch index d8ac0f52..b0e8f88f 100644 --- a/0009-Disable-GRUB-video-support-for-IBM-power-machines.patch +++ b/0009-Disable-GRUB-video-support-for-IBM-power-machines.patch @@ -1,7 +1,7 @@ -From db3e5c1a3d143f34d56b046377cd9fd86e5ec2d6 Mon Sep 17 00:00:00 2001 +From 0ca5375206e061c0229301c19d1311f8b0499c11 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 11 Jun 2013 15:14:05 -0300 -Subject: [PATCH 09/84] Disable GRUB video support for IBM power machines +Subject: [PATCH 09/85] Disable GRUB video support for IBM power machines Should fix the problem in bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=973205 diff --git a/0008-Add-support-for-UEFI-operating-systems-returned-by-o.patch b/0010-Add-support-for-UEFI-operating-systems-returned-by-o.patch similarity index 90% rename from 0008-Add-support-for-UEFI-operating-systems-returned-by-o.patch rename to 0010-Add-support-for-UEFI-operating-systems-returned-by-o.patch index 7fb44d6b..8b5d6155 100644 --- a/0008-Add-support-for-UEFI-operating-systems-returned-by-o.patch +++ b/0010-Add-support-for-UEFI-operating-systems-returned-by-o.patch @@ -1,7 +1,7 @@ -From b595a4f859e7b69040421f2e782c7f0ec0c98345 Mon Sep 17 00:00:00 2001 +From 2f3c6669c5f8d0255e6103508eb71667d8dec158 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 12 Jun 2013 11:51:49 -0400 -Subject: [PATCH 08/84] Add support for UEFI operating systems returned by +Subject: [PATCH 10/85] Add support for UEFI operating systems returned by os-prober os-prober returns UEFI operating systems in the form: diff --git a/0020-Make-efi-machines-load-an-env-block-from-a-variable.patch b/0011-Make-efi-machines-load-an-env-block-from-a-variable.patch similarity index 94% rename from 0020-Make-efi-machines-load-an-env-block-from-a-variable.patch rename to 0011-Make-efi-machines-load-an-env-block-from-a-variable.patch index a4bab5e4..1cce03f7 100644 --- a/0020-Make-efi-machines-load-an-env-block-from-a-variable.patch +++ b/0011-Make-efi-machines-load-an-env-block-from-a-variable.patch @@ -1,7 +1,7 @@ -From fedda3d4db2953b8e971bfb2fbffe7ef0c12a4bd Mon Sep 17 00:00:00 2001 +From 05f2dc34ddf1bd0ce75edfedfa68236c51165350 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 7 Dec 2015 14:20:49 -0500 -Subject: [PATCH 20/84] Make efi machines load an env block from a variable +Subject: [PATCH 11/85] Make efi machines load an env block from a variable Signed-off-by: Peter Jones --- diff --git a/0017-Make-exit-take-a-return-code.patch b/0012-Make-exit-take-a-return-code.patch similarity index 96% rename from 0017-Make-exit-take-a-return-code.patch rename to 0012-Make-exit-take-a-return-code.patch index d56ded5d..67f7ca62 100644 --- a/0017-Make-exit-take-a-return-code.patch +++ b/0012-Make-exit-take-a-return-code.patch @@ -1,7 +1,7 @@ -From 1424c8dbcd795da2f41aa588803dc808c78084d4 Mon Sep 17 00:00:00 2001 -From: Fedora Ninjas +From 1f1a695cc6dedd19ecb7ff50c66a8f57d50e362b Mon Sep 17 00:00:00 2001 +From: Peter Jones Date: Wed, 26 Feb 2014 21:49:12 -0500 -Subject: [PATCH 17/84] Make "exit" take a return code. +Subject: [PATCH 12/85] 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 @@ -177,10 +177,10 @@ index be88b77..8b6c55f 100644 grub_halt (); } diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 8354164..81be344 100644 +index d1a54df..6bb0351 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c -@@ -1097,7 +1097,7 @@ grub_abort (void) +@@ -1094,7 +1094,7 @@ grub_abort (void) grub_getkey (); } diff --git a/0019-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch b/0013-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch similarity index 76% rename from 0019-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch rename to 0013-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch index 9a45324e..678dfd59 100644 --- a/0019-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch +++ b/0013-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch @@ -1,7 +1,7 @@ -From 12c7d6cbeb8bdf9e0c990315c414a98eb056efae Mon Sep 17 00:00:00 2001 +From cb62c40cb96d103e5675dc25ca17a38226e91305 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 22 Jul 2015 11:21:01 -0400 -Subject: [PATCH 19/84] Mark po/exclude.pot as binary so git won't try to diff +Subject: [PATCH 13/85] Mark po/exclude.pot as binary so git won't try to diff nonprintables. Signed-off-by: Peter Jones diff --git a/0016-Fix-bzr-s-ignore-artificats-in-.gitignore.patch b/0014-Fix-bzr-s-ignore-artificats-in-.gitignore.patch similarity index 98% rename from 0016-Fix-bzr-s-ignore-artificats-in-.gitignore.patch rename to 0014-Fix-bzr-s-ignore-artificats-in-.gitignore.patch index 0cfcf95b..7e8931e6 100644 --- a/0016-Fix-bzr-s-ignore-artificats-in-.gitignore.patch +++ b/0014-Fix-bzr-s-ignore-artificats-in-.gitignore.patch @@ -1,7 +1,7 @@ -From 6d2c0321bbc530a3dff070c7555248cafa45a7e9 Mon Sep 17 00:00:00 2001 +From e0bb91aa1752a0a2bc3c4b0bdc4c49430b470ebc Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 7 Jul 2015 10:13:14 -0400 -Subject: [PATCH 16/84] Fix bzr's ignore artificats in .gitignore +Subject: [PATCH 14/85] 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. diff --git a/0018-Add-some-__unused__-where-gcc-5.x-is-more-picky-abou.patch b/0015-Add-some-__unused__-where-gcc-5.x-is-more-picky-abou.patch similarity index 91% rename from 0018-Add-some-__unused__-where-gcc-5.x-is-more-picky-abou.patch rename to 0015-Add-some-__unused__-where-gcc-5.x-is-more-picky-abou.patch index 457e0514..3b589b72 100644 --- a/0018-Add-some-__unused__-where-gcc-5.x-is-more-picky-abou.patch +++ b/0015-Add-some-__unused__-where-gcc-5.x-is-more-picky-abou.patch @@ -1,7 +1,7 @@ -From e406ca2c569d1910eedf58c5647d3a524a09a60e Mon Sep 17 00:00:00 2001 +From ecaecc9bc12a86a64bffeb64879c621da10d5136 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 7 Jul 2015 12:04:28 -0400 -Subject: [PATCH 18/84] Add some __unused__ where gcc 5.x is more picky about +Subject: [PATCH 15/85] Add some __unused__ where gcc 5.x is more picky about it. With some build flags, gcc 5.x throws more warnings about __unused__ not @@ -63,10 +63,10 @@ index 4880cef..1b1986f 100644 lang = grub_env_get ("lang"); diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c -index 4fecc28..73a94aa 100644 +index 719e2fb..cd15f04 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c -@@ -829,7 +829,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot) +@@ -807,7 +807,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot) /* Callback invoked immediately before a menu entry is executed. */ static void diff --git a/0006-Move-bash-completion-script-922997.patch b/0016-Move-bash-completion-script-922997.patch similarity index 86% rename from 0006-Move-bash-completion-script-922997.patch rename to 0016-Move-bash-completion-script-922997.patch index 94f99bc4..e66c3a47 100644 --- a/0006-Move-bash-completion-script-922997.patch +++ b/0016-Move-bash-completion-script-922997.patch @@ -1,7 +1,7 @@ -From 1308e8229fc47df1cdecac5949d886404ef87b47 Mon Sep 17 00:00:00 2001 +From e704140ffbdc0bbe0cf9ddc66f1ffe51018078ae Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Apr 2013 14:35:34 -0400 -Subject: [PATCH 06/84] Move bash completion script (#922997) +Subject: [PATCH 16/85] Move bash completion script (#922997) Apparently these go in a new place now. --- diff --git a/0014-Allow-fallback-to-include-entries-by-title-not-just-.patch b/0017-Allow-fallback-to-include-entries-by-title-not-just-.patch similarity index 95% rename from 0014-Allow-fallback-to-include-entries-by-title-not-just-.patch rename to 0017-Allow-fallback-to-include-entries-by-title-not-just-.patch index 694108a4..9b2e745d 100644 --- a/0014-Allow-fallback-to-include-entries-by-title-not-just-.patch +++ b/0017-Allow-fallback-to-include-entries-by-title-not-just-.patch @@ -1,7 +1,7 @@ -From 4261ea480b10ab6beab394fcaf12749164ce2fc5 Mon Sep 17 00:00:00 2001 +From bc5d351596ec8d95b837e23f9775db6d8bd7fd29 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 5 Sep 2014 10:07:04 -0400 -Subject: [PATCH 14/84] Allow "fallback" to include entries by title, not just +Subject: [PATCH 17/85] Allow "fallback" to include entries by title, not just number. Resolves: rhbz#1026084 @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones 1 file changed, 49 insertions(+), 27 deletions(-) diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c -index 719e2fb..4fecc28 100644 +index cd15f04..73a94aa 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c @@ -163,12 +163,35 @@ grub_menu_set_timeout (int timeout) diff --git a/0010-Honor-a-symlink-when-generating-configuration-by-gru.patch b/0018-Honor-a-symlink-when-generating-configuration-by-gru.patch similarity index 74% rename from 0010-Honor-a-symlink-when-generating-configuration-by-gru.patch rename to 0018-Honor-a-symlink-when-generating-configuration-by-gru.patch index 1d2ec459..dcfd5c57 100644 --- a/0010-Honor-a-symlink-when-generating-configuration-by-gru.patch +++ b/0018-Honor-a-symlink-when-generating-configuration-by-gru.patch @@ -1,7 +1,7 @@ -From 614d0110ecf477c183afd7de9d8ac9aa8755f259 Mon Sep 17 00:00:00 2001 +From 7401bf6fb1f319f6f910391f57680e9794678878 Mon Sep 17 00:00:00 2001 From: Marcel Kolaja Date: Tue, 21 Jan 2014 10:57:08 -0500 -Subject: [PATCH 10/84] Honor a symlink when generating configuration by +Subject: [PATCH 18/85] Honor a symlink when generating configuration by grub2-mkconfig Honor a symlink when generating configuration by grub2-mkconfig, so that @@ -11,11 +11,11 @@ the -o option follows it rather than overwriting it with a regular file. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 203b076..4345ea7 100644 +index f8496d2..3b070fd 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in -@@ -275,7 +275,8 @@ and /etc/grub.d/* files or please file a bug report with - echo >&2 +@@ -276,7 +276,8 @@ and /etc/grub.d/* files or please file a bug report with + exit 1 else # none of the children aborted with error, install the new grub.cfg - mv -f ${grub_cfg}.new ${grub_cfg} diff --git a/0012-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch b/0019-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch similarity index 90% rename from 0012-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch rename to 0019-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch index 3ae51352..6e3831dd 100644 --- a/0012-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch +++ b/0019-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch @@ -1,7 +1,7 @@ -From 4fdc2c3e8d35d5d9afd0350478944b3c350dbdff Mon Sep 17 00:00:00 2001 +From 5212412d2c54f112cb68aa5dfc4711abdec9ce94 Mon Sep 17 00:00:00 2001 From: Prarit Bhargava Date: Wed, 12 Mar 2014 10:58:16 -0400 -Subject: [PATCH 12/84] Fix bad test on GRUB_DISABLE_SUBMENU. +Subject: [PATCH 19/85] Fix bad test on GRUB_DISABLE_SUBMENU. The file /etc/grub.d/10_linux does diff --git a/0013-Add-GRUB_DISABLE_UUID.patch b/0020-Add-GRUB_DISABLE_UUID.patch similarity index 96% rename from 0013-Add-GRUB_DISABLE_UUID.patch rename to 0020-Add-GRUB_DISABLE_UUID.patch index 9466898a..fa49fb32 100644 --- a/0013-Add-GRUB_DISABLE_UUID.patch +++ b/0020-Add-GRUB_DISABLE_UUID.patch @@ -1,7 +1,7 @@ -From 261fa3b929847823e865f23fdd8bbd6d7a2271aa Mon Sep 17 00:00:00 2001 +From 73545c78c604559e2af231f1b526265ba15c3839 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 16:49:25 -0400 -Subject: [PATCH 13/84] Add GRUB_DISABLE_UUID. +Subject: [PATCH 20/85] 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 @@ -33,7 +33,7 @@ index 82f6fa4..98d4d0d 100644 If graphical video support is required, either because the @samp{gfxterm} graphical terminal is in use or because @samp{GRUB_GFXPAYLOAD_LINUX} is set, diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 4345ea7..e576c98 100644 +index 3b070fd..c088b70 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -133,11 +133,11 @@ fi diff --git a/0004-Add-X-option-to-printf-functions.patch b/0021-Add-X-option-to-printf-functions.patch similarity index 90% rename from 0004-Add-X-option-to-printf-functions.patch rename to 0021-Add-X-option-to-printf-functions.patch index fc7929ae..72c06371 100644 --- a/0004-Add-X-option-to-printf-functions.patch +++ b/0021-Add-X-option-to-printf-functions.patch @@ -1,14 +1,14 @@ -From 5e9b9981b492b4e4fe57eb501315ea0e0ef9ce4f Mon Sep 17 00:00:00 2001 +From 356b0c4cb947c5f7983cfe8a4cc1e89e8118f4c2 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 16:58:39 -0200 -Subject: [PATCH 04/84] Add %X option to printf functions. +Subject: [PATCH 21/85] Add %X option to printf functions. --- grub-core/kern/misc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index d1a54df..8354164 100644 +index 6bb0351..81be344 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -587,7 +587,7 @@ grub_divmod64 (grub_uint64_t n, grub_uint64_t d, grub_uint64_t *r) diff --git a/0022-Migrate-PPC-from-Yaboot-to-Grub2.patch b/0022-Migrate-PPC-from-Yaboot-to-Grub2.patch index 8171059b..52e19b1c 100644 --- a/0022-Migrate-PPC-from-Yaboot-to-Grub2.patch +++ b/0022-Migrate-PPC-from-Yaboot-to-Grub2.patch @@ -1,7 +1,7 @@ -From e36c06dd35d09e97033fcacd5cfb61b54031555c Mon Sep 17 00:00:00 2001 +From c6addd5bf471e6596f6c180a8d83a31df59c6d69 Mon Sep 17 00:00:00 2001 From: Mark Hamzy Date: Wed, 28 Mar 2012 14:46:41 -0500 -Subject: [PATCH 22/84] Migrate PPC from Yaboot to Grub2 +Subject: [PATCH 22/85] 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. diff --git a/0023-Add-fw_path-variable-revised.patch b/0023-Add-fw_path-variable-revised.patch index 02d16e78..eca6f521 100644 --- a/0023-Add-fw_path-variable-revised.patch +++ b/0023-Add-fw_path-variable-revised.patch @@ -1,7 +1,7 @@ -From d90a70f58ecafc5e6da157345d35ccf68c207c14 Mon Sep 17 00:00:00 2001 +From a0c5493ead025948d40154dde08cb8504a1c840c Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 19 Sep 2012 21:22:55 -0300 -Subject: [PATCH 23/84] Add fw_path variable (revised) +Subject: [PATCH 23/85] 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 diff --git a/0024-Add-support-for-linuxefi.patch b/0024-Add-support-for-linuxefi.patch index 8661ae17..23fa3b6f 100644 --- a/0024-Add-support-for-linuxefi.patch +++ b/0024-Add-support-for-linuxefi.patch @@ -1,7 +1,7 @@ -From 2e9bdf8a9adcfa26e3bd7bce548c104f220fea6a Mon Sep 17 00:00:00 2001 +From e7f9069fb31f0b112d7cd56872253287ab8c99a5 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 10 Jul 2012 11:58:52 -0400 -Subject: [PATCH 24/84] Add support for linuxefi +Subject: [PATCH 24/85] Add support for linuxefi --- grub-core/Makefile.core.def | 8 + diff --git a/0025-Use-linuxefi-and-initrdefi-where-appropriate.patch b/0025-Use-linuxefi-and-initrdefi-where-appropriate.patch index c04f54e3..0a75f9ad 100644 --- a/0025-Use-linuxefi-and-initrdefi-where-appropriate.patch +++ b/0025-Use-linuxefi-and-initrdefi-where-appropriate.patch @@ -1,7 +1,7 @@ -From 013c6c89d03cb409b6aaad53ff76d24493246487 Mon Sep 17 00:00:00 2001 +From 8c186e1142ec99ecde320a673cb72cbbcaa98936 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 16 Jul 2012 18:57:11 -0400 -Subject: [PATCH 25/84] Use "linuxefi" and "initrdefi" where appropriate. +Subject: [PATCH 25/85] Use "linuxefi" and "initrdefi" where appropriate. --- util/grub.d/10_linux.in | 18 ++++++++++++++++-- diff --git a/0026-Don-t-allow-insmod-when-secure-boot-is-enabled.patch b/0026-Don-t-allow-insmod-when-secure-boot-is-enabled.patch index 7fd0fc0c..253d9272 100644 --- a/0026-Don-t-allow-insmod-when-secure-boot-is-enabled.patch +++ b/0026-Don-t-allow-insmod-when-secure-boot-is-enabled.patch @@ -1,7 +1,7 @@ -From 267a3758a50f99929058af3addd071cac40869dd Mon Sep 17 00:00:00 2001 +From b231f595542985cba4fb6c079e0d1ee82fc5983c Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 23 Oct 2012 10:40:49 -0400 -Subject: [PATCH 26/84] Don't allow insmod when secure boot is enabled. +Subject: [PATCH 26/85] Don't allow insmod when secure boot is enabled. Hi, diff --git a/0027-Pass-x-hex-hex-straight-through-unmolested.patch b/0027-Pass-x-hex-hex-straight-through-unmolested.patch index 3b2f0e16..688671d8 100644 --- a/0027-Pass-x-hex-hex-straight-through-unmolested.patch +++ b/0027-Pass-x-hex-hex-straight-through-unmolested.patch @@ -1,7 +1,7 @@ -From 982930404b790cfb35bd5f29ce1ba0c708fc0051 Mon Sep 17 00:00:00 2001 +From ed9658a2d5f703e68e098b19726ef162e6c755b7 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 1 Oct 2012 13:24:37 -0400 -Subject: [PATCH 27/84] Pass "\x[[:hex:]][[:hex:]]" straight through +Subject: [PATCH 27/85] Pass "\x[[:hex:]][[:hex:]]" straight through unmolested. --- diff --git a/0028-Search-for-specific-config-file-for-netboot.patch b/0028-Search-for-specific-config-file-for-netboot.patch index 3355e5a8..1e4c406c 100644 --- a/0028-Search-for-specific-config-file-for-netboot.patch +++ b/0028-Search-for-specific-config-file-for-netboot.patch @@ -1,7 +1,7 @@ -From 0e7f063c273be8b13c259824c3d660232def40a4 Mon Sep 17 00:00:00 2001 +From a4b155fe619747aeb5eac12ca02d3cec83532756 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 17:22:07 -0200 -Subject: [PATCH 28/84] Search for specific config file for netboot +Subject: [PATCH 28/85] 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: diff --git a/0029-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch b/0029-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch index 236588e3..c7d7d899 100644 --- a/0029-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch +++ b/0029-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch @@ -1,7 +1,7 @@ -From a0e15f6d86f9c21e2c0f9233f3ba43d7a861d3f1 Mon Sep 17 00:00:00 2001 +From 14812d576121fdc90b05ede5d1f30075b4ab2396 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Tue, 22 Jan 2013 06:31:38 +0100 -Subject: [PATCH 29/84] blscfg: add blscfg module to parse Boot Loader +Subject: [PATCH 29/85] blscfg: add blscfg module to parse Boot Loader Specification snippets http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec diff --git a/0030-Don-t-write-messages-to-the-screen.patch b/0030-Don-t-write-messages-to-the-screen.patch index 37bd386c..d94d042c 100644 --- a/0030-Don-t-write-messages-to-the-screen.patch +++ b/0030-Don-t-write-messages-to-the-screen.patch @@ -1,7 +1,7 @@ -From 9e287ef25f7a64c356984b21b0812aab735ca9e9 Mon Sep 17 00:00:00 2001 +From 83a711aa32c98578a9a38c71eef6659fe4cc90a7 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 13:30:20 -0400 -Subject: [PATCH 30/84] Don't write messages to the screen +Subject: [PATCH 30/85] 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 diff --git a/0031-Don-t-print-GNU-GRUB-header.patch b/0031-Don-t-print-GNU-GRUB-header.patch index b8916c49..e0caddce 100644 --- a/0031-Don-t-print-GNU-GRUB-header.patch +++ b/0031-Don-t-print-GNU-GRUB-header.patch @@ -1,7 +1,7 @@ -From 55b0cc68bae2139c6ec5c7a51310f6e564b14b21 Mon Sep 17 00:00:00 2001 +From 4a5b10c4083c9b99aed2e98577e7634b74c250d9 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 13:53:48 -0400 -Subject: [PATCH 31/84] Don't print GNU GRUB header +Subject: [PATCH 31/85] Don't print GNU GRUB header No one cares. --- diff --git a/0032-Don-t-add-to-highlighted-row.patch b/0032-Don-t-add-to-highlighted-row.patch index 14b26274..35eda311 100644 --- a/0032-Don-t-add-to-highlighted-row.patch +++ b/0032-Don-t-add-to-highlighted-row.patch @@ -1,7 +1,7 @@ -From 224e0a50040de66ac6c6b4295a47300e81c864fd Mon Sep 17 00:00:00 2001 +From b8293967f7455f70a3f586f5583d7a9e5cc6772c Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 17:49:45 -0400 -Subject: [PATCH 32/84] Don't add '*' to highlighted row +Subject: [PATCH 32/85] Don't add '*' to highlighted row It is already highlighted. --- diff --git a/0033-Message-string-cleanups.patch b/0033-Message-string-cleanups.patch index 707af8a6..e928aa52 100644 --- a/0033-Message-string-cleanups.patch +++ b/0033-Message-string-cleanups.patch @@ -1,7 +1,7 @@ -From 312b476b9c86b81daf224fce1c39012e6f1f6fd3 Mon Sep 17 00:00:00 2001 +From 6b0f11d8c752b5a7b5030e2cd19ba3b78b7dd901 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 11:09:04 -0400 -Subject: [PATCH 33/84] Message string cleanups +Subject: [PATCH 33/85] Message string cleanups Make use of terminology consistent. Remove jargon. --- diff --git a/0034-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch b/0034-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch index 3f5d2c4d..07acbb7a 100644 --- a/0034-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch +++ b/0034-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch @@ -1,7 +1,7 @@ -From 0ba4fd0deb1e6a4f8371755d4a114f73135b6f1a Mon Sep 17 00:00:00 2001 +From a31995777db4d7603e0cd901a4a643812e023f51 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:08:23 -0400 -Subject: [PATCH 34/84] Fix border spacing now that we aren't displaying it +Subject: [PATCH 34/85] Fix border spacing now that we aren't displaying it --- grub-core/normal/menu_text.c | 6 +++--- diff --git a/0035-Use-the-correct-indentation-for-the-term-help-text.patch b/0035-Use-the-correct-indentation-for-the-term-help-text.patch index efe6b7e9..0190219b 100644 --- a/0035-Use-the-correct-indentation-for-the-term-help-text.patch +++ b/0035-Use-the-correct-indentation-for-the-term-help-text.patch @@ -1,7 +1,7 @@ -From d3e6135ee27820422710c33f04a818629da5d173 Mon Sep 17 00:00:00 2001 +From 2a01b399c5c73096ae372eb1f342b8a0f8f47030 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:08:49 -0400 -Subject: [PATCH 35/84] Use the correct indentation for the term help text +Subject: [PATCH 35/85] Use the correct indentation for the term help text That is consistent with the menu help text --- diff --git a/0036-Indent-menu-entries.patch b/0036-Indent-menu-entries.patch index 4232adda..e79af1ee 100644 --- a/0036-Indent-menu-entries.patch +++ b/0036-Indent-menu-entries.patch @@ -1,7 +1,7 @@ -From 3fd8f20e8c10cddd2bbafc1813214baa347c5180 Mon Sep 17 00:00:00 2001 +From f670c1c2e4a55188b3654aaac307e20a6c896796 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:30:55 -0400 -Subject: [PATCH 36/84] Indent menu entries +Subject: [PATCH 36/85] Indent menu entries --- grub-core/normal/menu_text.c | 3 ++- diff --git a/0037-Fix-margins.patch b/0037-Fix-margins.patch index 447f67ed..cd6a0349 100644 --- a/0037-Fix-margins.patch +++ b/0037-Fix-margins.patch @@ -1,7 +1,7 @@ -From a218713b98a679f13dcd64d3862c3a73cb904f89 Mon Sep 17 00:00:00 2001 +From 397d978c51b6ac1db63e05de786334ceb6a40636 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:59:36 -0400 -Subject: [PATCH 37/84] Fix margins +Subject: [PATCH 37/85] Fix margins --- grub-core/normal/menu_text.c | 8 +++----- diff --git a/0038-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch b/0038-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch index faf4722e..a09a3206 100644 --- a/0038-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch +++ b/0038-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch @@ -1,7 +1,7 @@ -From 5c4c01af03cc066441971d55949867773478764b Mon Sep 17 00:00:00 2001 +From b5566d5a3ee9ada0c397102bd51887c7e0d7305f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 21 Jun 2013 14:44:08 -0400 -Subject: [PATCH 38/84] Use -2 instead of -1 for our right-hand margin, so +Subject: [PATCH 38/85] Use -2 instead of -1 for our right-hand margin, so linewrapping works (#976643). Signed-off-by: Peter Jones diff --git a/0039-Use-linux16-when-appropriate-880840.patch b/0039-Use-linux16-when-appropriate-880840.patch index 70fa3f9a..a002d15d 100644 --- a/0039-Use-linux16-when-appropriate-880840.patch +++ b/0039-Use-linux16-when-appropriate-880840.patch @@ -1,7 +1,7 @@ -From e41a76897d0af0250e5a7da4cc88da07156320c4 Mon Sep 17 00:00:00 2001 +From 2366e7d0b5915ca44930a682258a0a913269befc Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:05:07 -0400 -Subject: [PATCH 39/84] Use linux16 when appropriate (#880840) +Subject: [PATCH 39/85] Use linux16 when appropriate (#880840) The kernel group really would prefer that we use the 16 bit entry point on x86 bios machines. diff --git a/0040-Enable-pager-by-default.-985860.patch b/0040-Enable-pager-by-default.-985860.patch index 57d5a313..ab479cc8 100644 --- a/0040-Enable-pager-by-default.-985860.patch +++ b/0040-Enable-pager-by-default.-985860.patch @@ -1,7 +1,7 @@ -From 62eed7a3cb99c04a303aff796d10fd0fe660dab9 Mon Sep 17 00:00:00 2001 +From 0c2e9a7c6f7f781542d3a94a5fc9b0b8ce435cd2 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:09:27 -0400 -Subject: [PATCH 40/84] Enable pager by default. (#985860) +Subject: [PATCH 40/85] Enable pager by default. (#985860) Signed-off-by: Peter Jones --- diff --git a/0041-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch b/0041-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch index 9190b5cf..0f134624 100644 --- a/0041-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch +++ b/0041-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch @@ -1,7 +1,7 @@ -From 3f53f8ca96c9da0847d772e9a7a3074917caefac Mon Sep 17 00:00:00 2001 +From 9cbaea1b39567552e4e103cb35a7c18fdc36395a Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:13:27 -0400 -Subject: [PATCH 41/84] F10 doesn't work on serial, so don't tell the user to +Subject: [PATCH 41/85] F10 doesn't work on serial, so don't tell the user to hit it (#987443) Signed-off-by: Peter Jones diff --git a/0042-Don-t-say-GNU-Linux-in-generated-menus.patch b/0042-Don-t-say-GNU-Linux-in-generated-menus.patch index 114da3bb..ec91a65b 100644 --- a/0042-Don-t-say-GNU-Linux-in-generated-menus.patch +++ b/0042-Don-t-say-GNU-Linux-in-generated-menus.patch @@ -1,7 +1,7 @@ -From b3cb39e03253a964b07176c386d582e3f58cf8ac Mon Sep 17 00:00:00 2001 +From af21e1092f7b99e1815b5a4653a15586580fd398 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 14 Mar 2011 14:27:42 -0400 -Subject: [PATCH 42/84] Don't say "GNU/Linux" in generated menus. +Subject: [PATCH 42/85] Don't say "GNU/Linux" in generated menus. --- util/grub.d/10_linux.in | 4 ++-- diff --git a/0043-Don-t-draw-a-border-around-the-menu.patch b/0043-Don-t-draw-a-border-around-the-menu.patch index b0e63079..b64cb4bc 100644 --- a/0043-Don-t-draw-a-border-around-the-menu.patch +++ b/0043-Don-t-draw-a-border-around-the-menu.patch @@ -1,7 +1,7 @@ -From 55b55f9ce4b36217a57847b20df6ebb53d0c739f Mon Sep 17 00:00:00 2001 +From 7874cc5b2a72249ec7bdea308cc7f689428a8714 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 16:47:33 -0400 -Subject: [PATCH 43/84] Don't draw a border around the menu +Subject: [PATCH 43/85] Don't draw a border around the menu It looks cleaner without it. --- diff --git a/0044-Use-the-standard-margin-for-the-timeout-string.patch b/0044-Use-the-standard-margin-for-the-timeout-string.patch index 3545d060..95283d04 100644 --- a/0044-Use-the-standard-margin-for-the-timeout-string.patch +++ b/0044-Use-the-standard-margin-for-the-timeout-string.patch @@ -1,7 +1,7 @@ -From 53ca27b6d4ecdbe22925f5d0413880f3354397ec Mon Sep 17 00:00:00 2001 +From c18188e88655d8404dc1687b5a5c4e3ae1a01c7c Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 10:52:32 -0400 -Subject: [PATCH 44/84] Use the standard margin for the timeout string +Subject: [PATCH 44/85] Use the standard margin for the timeout string So that it aligns with the other messages --- diff --git a/0045-Add-.eh_frame-to-list-of-relocations-stripped.patch b/0045-Add-.eh_frame-to-list-of-relocations-stripped.patch index 1b552679..7bb3ec87 100644 --- a/0045-Add-.eh_frame-to-list-of-relocations-stripped.patch +++ b/0045-Add-.eh_frame-to-list-of-relocations-stripped.patch @@ -1,7 +1,7 @@ -From d6171073d7ebaee23fce165808d9337cd66ca4ea Mon Sep 17 00:00:00 2001 +From 5baee32f7f9771fe64fa0cdf6e49cd4f6158487a Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Mon, 13 Jan 2014 21:50:59 -0500 -Subject: [PATCH 45/84] Add .eh_frame to list of relocations stripped +Subject: [PATCH 45/85] Add .eh_frame to list of relocations stripped --- conf/Makefile.common | 2 +- diff --git a/0046-Make-10_linux-work-with-our-changes-for-linux16-and-.patch b/0046-Make-10_linux-work-with-our-changes-for-linux16-and-.patch index 0ffa2270..920bea2d 100644 --- a/0046-Make-10_linux-work-with-our-changes-for-linux16-and-.patch +++ b/0046-Make-10_linux-work-with-our-changes-for-linux16-and-.patch @@ -1,7 +1,7 @@ -From 9581b69e619131f3d602284c62733c18678fcdaf Mon Sep 17 00:00:00 2001 +From ba2e29130c54c0082f2b9a6719e891c1a7397a03 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jan 2014 13:12:23 -0500 -Subject: [PATCH 46/84] Make 10_linux work with our changes for linux16 and +Subject: [PATCH 46/85] Make 10_linux work with our changes for linux16 and linuxefi on aarch64 Signed-off-by: Peter Jones diff --git a/0047-Don-t-print-during-fdt-loading-method.patch b/0047-Don-t-print-during-fdt-loading-method.patch index dfcfe160..b4823f31 100644 --- a/0047-Don-t-print-during-fdt-loading-method.patch +++ b/0047-Don-t-print-during-fdt-loading-method.patch @@ -1,7 +1,7 @@ -From 78e9fe794063875149b9e4105520423d6d3c6f8c Mon Sep 17 00:00:00 2001 +From 7c437680ba85ea5b1a7c98fd2b2e9ff8ddb00a1e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jan 2014 16:15:46 -0500 -Subject: [PATCH 47/84] Don't print during fdt loading method. +Subject: [PATCH 47/85] Don't print during fdt loading method. Signed-off-by: Peter Jones --- diff --git a/0048-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch b/0048-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch index 8d0bd554..39ce5a32 100644 --- a/0048-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch +++ b/0048-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch @@ -1,7 +1,7 @@ -From 3b37d2e328e221e81422370194a8ce1e0a5a932b Mon Sep 17 00:00:00 2001 +From 633be1409c09df43142eb1310234ff9ebfe0dc62 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 30 Jun 2014 14:16:46 -0400 -Subject: [PATCH 48/84] Don't munge raw spaces when we're doing our cmdline +Subject: [PATCH 48/85] Don't munge raw spaces when we're doing our cmdline escaping (#923374) Signed-off-by: Peter Jones diff --git a/0049-Don-t-require-a-password-to-boot-entries-generated-b.patch b/0049-Don-t-require-a-password-to-boot-entries-generated-b.patch index 7ed5e2d3..df886c02 100644 --- a/0049-Don-t-require-a-password-to-boot-entries-generated-b.patch +++ b/0049-Don-t-require-a-password-to-boot-entries-generated-b.patch @@ -1,7 +1,7 @@ -From 8fac789837a84b4b12446e8f79540edf4f49624a Mon Sep 17 00:00:00 2001 +From 030328c1b5d1266d5f664dafd6af52d765dbe3b0 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 11 Feb 2014 11:14:50 -0500 -Subject: [PATCH 49/84] Don't require a password to boot entries generated by +Subject: [PATCH 49/85] 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. diff --git a/0050-Don-t-emit-Booting-.-message.patch b/0050-Don-t-emit-Booting-.-message.patch index ac4c9226..24bd2caa 100644 --- a/0050-Don-t-emit-Booting-.-message.patch +++ b/0050-Don-t-emit-Booting-.-message.patch @@ -1,7 +1,7 @@ -From b14b8ac1abe0e8ba94ba7044186ad56bb5991271 Mon Sep 17 00:00:00 2001 +From 62ce77c55bb224f3c318d94cf45bf170d2fc806f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 18 Feb 2014 09:37:49 -0500 -Subject: [PATCH 50/84] Don't emit "Booting ..." message. +Subject: [PATCH 50/85] Don't emit "Booting ..." message. UI team still hates this stuff, so we're disabling it for RHEL 7. diff --git a/0051-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch b/0051-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch index 1cc3d54b..7796c5f5 100644 --- a/0051-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch +++ b/0051-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch @@ -1,7 +1,7 @@ -From 351b9c107d1d15609cb53621ad9082b4632b26d8 Mon Sep 17 00:00:00 2001 +From 07232bee88b91155ed2315db10d83e03e466efc6 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 4 Mar 2014 11:00:23 -0500 -Subject: [PATCH 51/84] Replace a lot of man pages with slightly nicer ones. +Subject: [PATCH 51/85] Replace a lot of man pages with slightly nicer ones. Replace a bunch of machine generated ones with ones that look nicer. --- diff --git a/0052-use-fw_path-prefix-when-fallback-searching-for-grub-.patch b/0052-use-fw_path-prefix-when-fallback-searching-for-grub-.patch index 178f4085..6a1b2abd 100644 --- a/0052-use-fw_path-prefix-when-fallback-searching-for-grub-.patch +++ b/0052-use-fw_path-prefix-when-fallback-searching-for-grub-.patch @@ -1,7 +1,7 @@ -From fd6c7a8709a23d6a4b8f942851d9f5795306807c Mon Sep 17 00:00:00 2001 +From a937e5533ae47be79d374fb99709282e16df4f0d Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Wed, 19 Feb 2014 15:58:43 -0500 -Subject: [PATCH 52/84] use fw_path prefix when fallback searching for grub +Subject: [PATCH 52/85] use fw_path prefix when fallback searching for grub config When PXE booting via UEFI firmware, grub was searching for grub.cfg diff --git a/0053-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch b/0053-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch index d66ba204..a68a6dab 100644 --- a/0053-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch +++ b/0053-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch @@ -1,7 +1,7 @@ -From ab6933e395beb44f75ed0a451e5036ac8c93f2d9 Mon Sep 17 00:00:00 2001 +From 780862554b3ee8a44c9d0b7e77ba219377a6b39b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 6 Mar 2014 11:51:33 -0500 -Subject: [PATCH 53/84] Try mac/guid/etc before grub.cfg on tftp config files. +Subject: [PATCH 53/85] Try mac/guid/etc before grub.cfg on tftp config files. Signed-off-by: Peter Jones --- diff --git a/0054-Fix-convert-function-to-support-NVMe-devices.patch b/0054-Fix-convert-function-to-support-NVMe-devices.patch index 22e247fb..151ed3ab 100644 --- a/0054-Fix-convert-function-to-support-NVMe-devices.patch +++ b/0054-Fix-convert-function-to-support-NVMe-devices.patch @@ -1,7 +1,7 @@ -From af87ce308a376abc81477977292c0afd9ea01f7a Mon Sep 17 00:00:00 2001 +From f35eaf656ac008e23937d5a31ece0e41df9e69cf Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 18 Feb 2014 11:34:00 -0500 -Subject: [PATCH 54/84] Fix convert function to support NVMe devices +Subject: [PATCH 54/85] 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 diff --git a/0055-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch b/0055-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch index ff3376ad..fa37e742 100644 --- a/0055-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch +++ b/0055-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch @@ -1,7 +1,7 @@ -From 50700eb3761e442dd7a569ad04165fd42d266298 Mon Sep 17 00:00:00 2001 +From 507dd275029deb504e0a7ffae3a7cd76f5701412 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Mon, 10 Feb 2014 16:13:10 -0500 -Subject: [PATCH 55/84] Switch to use APM Mustang device tree, for hardware +Subject: [PATCH 55/85] Switch to use APM Mustang device tree, for hardware testing. Signed-off-by: David A. Marlin diff --git a/0056-Use-the-default-device-tree-from-the-grub-default-fi.patch b/0056-Use-the-default-device-tree-from-the-grub-default-fi.patch index 4bbf3d4d..258e72c4 100644 --- a/0056-Use-the-default-device-tree-from-the-grub-default-fi.patch +++ b/0056-Use-the-default-device-tree-from-the-grub-default-fi.patch @@ -1,7 +1,7 @@ -From 48d90a9f4fcfcf1e3de386d23955a4beaff22858 Mon Sep 17 00:00:00 2001 +From 30fa988875e7b218240ac2100f4bab768c80a7f6 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Wed, 12 Feb 2014 14:54:04 -0500 -Subject: [PATCH 56/84] Use the default device tree from the grub default file +Subject: [PATCH 56/85] Use the default device tree from the grub default file instead of hardcoding a value. diff --git a/0057-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0057-reopen-SNP-protocol-for-exclusive-use-by-grub.patch index bda87273..f1e25781 100644 --- a/0057-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +++ b/0057-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -1,7 +1,7 @@ -From a889c7d2955b5afe2decc5f80e527d26b14eaedf Mon Sep 17 00:00:00 2001 +From a3f2c756ce34c9666bddef35e3b3b85ccecdcffc Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Sat, 15 Feb 2014 15:10:22 -0500 -Subject: [PATCH 57/84] reopen SNP protocol for exclusive use by grub +Subject: [PATCH 57/85] reopen SNP protocol for exclusive use by grub --- grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++ diff --git a/0058-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0058-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch new file mode 100644 index 00000000..d2da8791 --- /dev/null +++ b/0058-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -0,0 +1,54 @@ +From 5a6729292b36c493c81b4bfeef70434318a604f2 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Fri, 4 Mar 2016 15:13:59 -0500 +Subject: [PATCH 58/85] Revert "reopen SNP protocol for exclusive use by grub" + +This reverts commit a3f2c756ce34c9666bddef35e3b3b85ccecdcffc , which is +obsoleted by these: + +49426e9 efinet: open Simple Network Protocol exclusively +f348aee efinet: enable hardware filters when opening interface +c52ae40 efinet: skip virtual IPv4 and IPv6 devices when enumerating cards + +Signed-off-by: Peter Jones +--- + grub-core/net/drivers/efi/efinet.c | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c +index ea0e0ca..5388f95 100644 +--- a/grub-core/net/drivers/efi/efinet.c ++++ b/grub-core/net/drivers/efi/efinet.c +@@ -330,7 +330,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device, + { + struct grub_net_card *card; + grub_efi_device_path_t *dp; +- grub_efi_simple_network_t *net; + + dp = grub_efi_get_device_path (hnd); + if (! dp) +@@ -384,21 +383,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device, + &pxe_mode->dhcp_ack, + sizeof (pxe_mode->dhcp_ack), + 1, device, path); +- net = grub_efi_open_protocol (card->efi_handle, &net_io_guid, +- GRUB_EFI_OPEN_PROTOCOL_BY_EXCLUSIVE); +- if (net) { +- if (net->mode->state == GRUB_EFI_NETWORK_STOPPED +- && efi_call_1 (net->start, net) != GRUB_EFI_SUCCESS) +- continue; +- +- if (net->mode->state == GRUB_EFI_NETWORK_STOPPED) +- continue; +- +- if (net->mode->state == GRUB_EFI_NETWORK_STARTED +- && efi_call_3 (net->initialize, net, 0, 0) != GRUB_EFI_SUCCESS) +- continue; +- card->efi_net = net; +- } + return; + } + } +-- +2.5.0 + diff --git a/0058-Add-grub_util_readlink.patch b/0059-Add-grub_util_readlink.patch similarity index 99% rename from 0058-Add-grub_util_readlink.patch rename to 0059-Add-grub_util_readlink.patch index 3f5a7087..e4837e9c 100644 --- a/0058-Add-grub_util_readlink.patch +++ b/0059-Add-grub_util_readlink.patch @@ -1,7 +1,7 @@ -From a8b13c9b971ef22ba2f5b2ac5d23719d2224d3b2 Mon Sep 17 00:00:00 2001 +From deb910d72a3a8745ca207e75f5caa09b0264606c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Sep 2014 10:01:03 -0400 -Subject: [PATCH 58/84] Add grub_util_readlink() +Subject: [PATCH 59/85] 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 diff --git a/0059-Make-editenv-chase-symlinks-including-those-across-d.patch b/0060-Make-editenv-chase-symlinks-including-those-across-d.patch similarity index 95% rename from 0059-Make-editenv-chase-symlinks-including-those-across-d.patch rename to 0060-Make-editenv-chase-symlinks-including-those-across-d.patch index bf3aeee3..190a18a6 100644 --- a/0059-Make-editenv-chase-symlinks-including-those-across-d.patch +++ b/0060-Make-editenv-chase-symlinks-including-those-across-d.patch @@ -1,7 +1,7 @@ -From 69f0407fa1d49c7fe7bfadc65c42eaadf03717c5 Mon Sep 17 00:00:00 2001 +From 4c54fc0998ac13e7d38ba44cefcda9384d794475 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Sep 2014 10:38:00 -0400 -Subject: [PATCH 59/84] Make editenv chase symlinks including those across +Subject: [PATCH 60/85] Make editenv chase symlinks including those across devices. This lets us make /boot/grub2/grubenv a symlink to diff --git a/0060-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch b/0061-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch similarity index 89% rename from 0060-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch rename to 0061-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch index 1f2f8d84..f0aacbfb 100644 --- a/0060-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch +++ b/0061-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch @@ -1,7 +1,7 @@ -From ac24e029b2ec0ef213fe3c061ede46c7f84baa96 Mon Sep 17 00:00:00 2001 +From 5006f4ecf73a3742f1441177072dd814cd63e9b5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 14:23:23 -0400 -Subject: [PATCH 60/84] Generate OS and CLASS in 10_linux from /etc/os-release +Subject: [PATCH 61/85] 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. diff --git a/0061-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch b/0062-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch similarity index 89% rename from 0061-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch rename to 0062-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch index d0009e66..848e0470 100644 --- a/0061-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch +++ b/0062-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch @@ -1,7 +1,7 @@ -From c569bfac13a99b1eaab1fe5c2a7d9d190839c439 Mon Sep 17 00:00:00 2001 +From e6c8b26dece544383403a13019ad6d4991c72e4e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 15:52:08 -0400 -Subject: [PATCH 61/84] Minimize the sort ordering for .debug and -rescue- +Subject: [PATCH 62/85] Minimize the sort ordering for .debug and -rescue- kernels. Resolves: rhbz#1065360 diff --git a/0062-Load-arm-with-SB-enabled.patch b/0063-Load-arm-with-SB-enabled.patch similarity index 99% rename from 0062-Load-arm-with-SB-enabled.patch rename to 0063-Load-arm-with-SB-enabled.patch index 6926d3d7..ba6698bb 100644 --- a/0062-Load-arm-with-SB-enabled.patch +++ b/0063-Load-arm-with-SB-enabled.patch @@ -1,7 +1,7 @@ -From b0a16f0d97268e8b5a36419005697cce30d29a71 Mon Sep 17 00:00:00 2001 +From d0ea23d1dd262db1d131f1fb8bf3d1e6c67ec252 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 18 Sep 2014 11:26:14 -0400 -Subject: [PATCH 62/84] Load arm with SB enabled. +Subject: [PATCH 63/85] 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.) diff --git a/0063-Try-prefix-if-fw_path-doesn-t-work.patch b/0064-Try-prefix-if-fw_path-doesn-t-work.patch similarity index 97% rename from 0063-Try-prefix-if-fw_path-doesn-t-work.patch rename to 0064-Try-prefix-if-fw_path-doesn-t-work.patch index c51378b2..b727ef27 100644 --- a/0063-Try-prefix-if-fw_path-doesn-t-work.patch +++ b/0064-Try-prefix-if-fw_path-doesn-t-work.patch @@ -1,7 +1,7 @@ -From bb05ed28974e747b7efbad5fd72f972f8980f9d2 Mon Sep 17 00:00:00 2001 +From 240f6e49d239635f7ca8cd2ca6103df534c92507 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 3 Oct 2014 11:08:03 -0400 -Subject: [PATCH 63/84] Try $prefix if $fw_path doesn't work. +Subject: [PATCH 64/85] Try $prefix if $fw_path doesn't work. Related: rhbz#1148652 diff --git a/0064-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch b/0065-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch similarity index 94% rename from 0064-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch rename to 0065-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch index 5c6671fe..06d4c7b4 100644 --- a/0064-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch +++ b/0065-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch @@ -1,7 +1,7 @@ -From 44253fdc11a62ee9f3562a4da65f28b777fdc428 Mon Sep 17 00:00:00 2001 +From ce8210df5c25af8ce319f6cd5b7578beaf3e9a22 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 27 Oct 2014 09:22:55 -0400 -Subject: [PATCH 64/84] Try to emit linux16/initrd16 and linuxefi/initrdefi in +Subject: [PATCH 65/85] Try to emit linux16/initrd16 and linuxefi/initrdefi in 30-os_prober. Resolves: rhbz#1108296 diff --git a/0065-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0066-Make-grub2-mkconfig-construct-titles-that-look-like-.patch similarity index 94% rename from 0065-Make-grub2-mkconfig-construct-titles-that-look-like-.patch rename to 0066-Make-grub2-mkconfig-construct-titles-that-look-like-.patch index 1d436d1b..a3866ed8 100644 --- a/0065-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +++ b/0066-Make-grub2-mkconfig-construct-titles-that-look-like-.patch @@ -1,7 +1,7 @@ -From 187035c5913d57656a1bef969042b3e741b84bbb Mon Sep 17 00:00:00 2001 +From 91f9701082fe351aa221323fb684e08c6b466b87 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 28 Apr 2015 11:15:03 -0400 -Subject: [PATCH 65/84] Make grub2-mkconfig construct titles that look like the +Subject: [PATCH 66/85] Make grub2-mkconfig construct titles that look like the ones we want elsewhere. Resolves: rhbz#1215839 diff --git a/0066-Update-info-with-grub.cfg-netboot-selection-order-11.patch b/0067-Update-info-with-grub.cfg-netboot-selection-order-11.patch similarity index 94% rename from 0066-Update-info-with-grub.cfg-netboot-selection-order-11.patch rename to 0067-Update-info-with-grub.cfg-netboot-selection-order-11.patch index a0054f3d..7690b6e0 100644 --- a/0066-Update-info-with-grub.cfg-netboot-selection-order-11.patch +++ b/0067-Update-info-with-grub.cfg-netboot-selection-order-11.patch @@ -1,7 +1,7 @@ -From 69fe8b8088331aad5a36ca8e638119d828c70aab Mon Sep 17 00:00:00 2001 +From 0fd74ec2eb69ee6147fbf2062a9eecceff24896b Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 16 Mar 2015 16:34:51 -0400 -Subject: [PATCH 66/84] Update info with grub.cfg netboot selection order +Subject: [PATCH 67/85] Update info with grub.cfg netboot selection order (#1148650) Added documentation to the grub info page that specifies the order diff --git a/0067-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch b/0068-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch similarity index 98% rename from 0067-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch rename to 0068-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch index 53c74bb7..74ad9f75 100644 --- a/0067-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch +++ b/0068-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch @@ -1,7 +1,7 @@ -From 7139ecde23c1951ba7f1f2542aa8fbde0520cf67 Mon Sep 17 00:00:00 2001 +From 368462b4c02b93431943242d069a13aaa3f7f410 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 16 Mar 2015 14:14:19 -0400 -Subject: [PATCH 67/84] Use Distribution Package Sort for grub2-mkconfig +Subject: [PATCH 68/85] Use Distribution Package Sort for grub2-mkconfig (#1124074) Users reported that newly installed kernels on their systems installed diff --git a/0068-Add-friendly-grub2-password-config-tool-985962.patch b/0069-Add-friendly-grub2-password-config-tool-985962.patch similarity index 98% rename from 0068-Add-friendly-grub2-password-config-tool-985962.patch rename to 0069-Add-friendly-grub2-password-config-tool-985962.patch index 82ba741f..76bf67d1 100644 --- a/0068-Add-friendly-grub2-password-config-tool-985962.patch +++ b/0069-Add-friendly-grub2-password-config-tool-985962.patch @@ -1,7 +1,7 @@ -From af1ed7aa16460f8a04a2077604af50b94cfad675 Mon Sep 17 00:00:00 2001 +From bcca98247da836509464b14549c34debb5b17bd3 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Thu, 25 Jun 2015 11:13:11 -0400 -Subject: [PATCH 68/84] Add friendly grub2 password config tool (#985962) +Subject: [PATCH 69/85] 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 diff --git a/0069-Fix-race-in-EFI-validation.patch b/0070-Fix-race-in-EFI-validation.patch similarity index 95% rename from 0069-Fix-race-in-EFI-validation.patch rename to 0070-Fix-race-in-EFI-validation.patch index 276bb929..07c68581 100644 --- a/0069-Fix-race-in-EFI-validation.patch +++ b/0070-Fix-race-in-EFI-validation.patch @@ -1,7 +1,7 @@ -From 3b25f843202bbb072ec23c9b1d24c564dcb5fff4 Mon Sep 17 00:00:00 2001 +From 4cee6969015be92d0a4371f4ccae7f36c6b80dc6 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 14 Jul 2015 16:58:51 -0700 -Subject: [PATCH 69/84] Fix race in EFI validation +Subject: [PATCH 70/85] Fix race in EFI validation --- grub-core/loader/i386/efi/linux.c | 44 ++++++++++----------------------------- diff --git a/0070-ppc64le-sync-mkconfig-to-disk-1212114.patch b/0071-ppc64le-sync-mkconfig-to-disk-1212114.patch similarity index 90% rename from 0070-ppc64le-sync-mkconfig-to-disk-1212114.patch rename to 0071-ppc64le-sync-mkconfig-to-disk-1212114.patch index 2826926c..640aa344 100644 --- a/0070-ppc64le-sync-mkconfig-to-disk-1212114.patch +++ b/0071-ppc64le-sync-mkconfig-to-disk-1212114.patch @@ -1,7 +1,7 @@ -From f62935eb77295a0c5f8bc4859a309366df8fd0b2 Mon Sep 17 00:00:00 2001 +From 6ea648a482015d3379acbe4f6f78991e3e923c47 Mon Sep 17 00:00:00 2001 From: Don Zickus Date: Wed, 22 Jul 2015 13:59:55 -0400 -Subject: [PATCH 70/84] ppc64le sync mkconfig to disk (#1212114) +Subject: [PATCH 71/85] 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, diff --git a/0071-Use-device-part-of-chainloader-target-if-present.patch b/0072-Use-device-part-of-chainloader-target-if-present.patch similarity index 89% rename from 0071-Use-device-part-of-chainloader-target-if-present.patch rename to 0072-Use-device-part-of-chainloader-target-if-present.patch index ee8b3e5d..86ca863e 100644 --- a/0071-Use-device-part-of-chainloader-target-if-present.patch +++ b/0072-Use-device-part-of-chainloader-target-if-present.patch @@ -1,7 +1,7 @@ -From daeac553ac11b332f1eb63a2aff8d988b3be17ee Mon Sep 17 00:00:00 2001 +From bdc3eb0098b4b7d85423bb5674e50d78b01f3f49 Mon Sep 17 00:00:00 2001 From: Raymund Will Date: Fri, 10 Apr 2015 01:45:02 -0400 -Subject: [PATCH 71/84] Use device part of chainloader target, if present. +Subject: [PATCH 72/85] Use device part of chainloader target, if present. Otherwise chainloading is restricted to '$root', which might not even be readable by EFI! diff --git a/0072-Add-secureboot-support-on-efi-chainloader.patch b/0073-Add-secureboot-support-on-efi-chainloader.patch similarity index 99% rename from 0072-Add-secureboot-support-on-efi-chainloader.patch rename to 0073-Add-secureboot-support-on-efi-chainloader.patch index ac72af59..b977598d 100644 --- a/0072-Add-secureboot-support-on-efi-chainloader.patch +++ b/0073-Add-secureboot-support-on-efi-chainloader.patch @@ -1,7 +1,7 @@ -From f5ce2cd7edc832cb87a7b937918fedd52b84a5d7 Mon Sep 17 00:00:00 2001 +From 5a211adebc2362cb5d7767bd95fe204f0d5cb852 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 6 Oct 2015 13:04:37 -0400 -Subject: [PATCH 72/84] Add secureboot support on efi chainloader +Subject: [PATCH 73/85] 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 diff --git a/0073-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/0074-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch similarity index 99% rename from 0073-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch rename to 0074-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch index 35f246a4..bed161cc 100644 --- a/0073-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch +++ b/0074-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch @@ -1,7 +1,7 @@ -From ebab909a3a310e70db12c1ee2e9c41708b07ef53 Mon Sep 17 00:00:00 2001 +From f1896dc881b276559079773ba666266979df2f74 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 6 Oct 2015 16:09:25 -0400 -Subject: [PATCH 73/84] Make any of the loaders that link in efi mode honor +Subject: [PATCH 74/85] 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 diff --git a/0074-Fix-security-issue-when-reading-username-and-passwor.patch b/0075-Fix-security-issue-when-reading-username-and-passwor.patch similarity index 89% rename from 0074-Fix-security-issue-when-reading-username-and-passwor.patch rename to 0075-Fix-security-issue-when-reading-username-and-passwor.patch index ba95a66e..ab2602ea 100644 --- a/0074-Fix-security-issue-when-reading-username-and-passwor.patch +++ b/0075-Fix-security-issue-when-reading-username-and-passwor.patch @@ -1,7 +1,7 @@ -From 01eb7229096581909923b3bbddc5f96102444ac7 Mon Sep 17 00:00:00 2001 +From a33e256429267872f469a2d3d1e36ac3721369b3 Mon Sep 17 00:00:00 2001 From: Hector Marco-Gisbert Date: Fri, 13 Nov 2015 16:21:09 +0100 -Subject: [PATCH 74/84] Fix security issue when reading username and password +Subject: [PATCH 75/85] Fix security issue when reading username and password This patch fixes two integer underflows at: * grub-core/lib/crypto.c diff --git a/0075-Make-grub_fatal-also-backtrace.patch b/0076-Make-grub_fatal-also-backtrace.patch similarity index 97% rename from 0075-Make-grub_fatal-also-backtrace.patch rename to 0076-Make-grub_fatal-also-backtrace.patch index f100f254..24c992e1 100644 --- a/0075-Make-grub_fatal-also-backtrace.patch +++ b/0076-Make-grub_fatal-also-backtrace.patch @@ -1,7 +1,7 @@ -From 2666d3d99c3d979625c28655165195177bc2290c Mon Sep 17 00:00:00 2001 +From 9e51bd34baf8c705380abb4dc4b3847c11c93829 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 27 Jan 2016 09:22:42 -0500 -Subject: [PATCH 75/84] Make grub_fatal() also backtrace. +Subject: [PATCH 76/85] Make grub_fatal() also backtrace. --- grub-core/Makefile.core.def | 3 ++ diff --git a/0076-Core-TPM-support.patch b/0077-Core-TPM-support.patch similarity index 99% rename from 0076-Core-TPM-support.patch rename to 0077-Core-TPM-support.patch index b1365b26..40201346 100644 --- a/0076-Core-TPM-support.patch +++ b/0077-Core-TPM-support.patch @@ -1,7 +1,7 @@ -From f594712a6e917c80885a4e5e2a0768b46d005958 Mon Sep 17 00:00:00 2001 +From 59e54f473afa4e4f67dde8f11a33cb8490496086 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 14 Jul 2015 17:06:35 -0700 -Subject: [PATCH 76/84] Core TPM support +Subject: [PATCH 77/85] Core TPM support Add support for performing basic TPM measurements. Right now this only supports extending PCRs statically and only on UEFI and BIOS systems, but diff --git a/0077-Measure-kernel-initrd.patch b/0078-Measure-kernel-initrd.patch similarity index 92% rename from 0077-Measure-kernel-initrd.patch rename to 0078-Measure-kernel-initrd.patch index e23a99e6..b05e4272 100644 --- a/0077-Measure-kernel-initrd.patch +++ b/0078-Measure-kernel-initrd.patch @@ -1,7 +1,7 @@ -From c999c6130354e7aced8ebf485172c593ff034d81 Mon Sep 17 00:00:00 2001 +From 878a4bed6479ccfbde4ba8dc3c2c029f12fba708 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Thu, 16 Jul 2015 15:22:34 -0700 -Subject: [PATCH 77/84] Measure kernel + initrd +Subject: [PATCH 78/85] Measure kernel + initrd Measure the kernel and initrd when loaded on UEFI systems --- diff --git a/0078-Add-BIOS-boot-measurement.patch b/0079-Add-BIOS-boot-measurement.patch similarity index 97% rename from 0078-Add-BIOS-boot-measurement.patch rename to 0079-Add-BIOS-boot-measurement.patch index 8ac09cf9..4604476b 100644 --- a/0078-Add-BIOS-boot-measurement.patch +++ b/0079-Add-BIOS-boot-measurement.patch @@ -1,7 +1,7 @@ -From 6715108eb5adec502b896feaca8997f841dcd335 Mon Sep 17 00:00:00 2001 +From b727ffaee53c9f3ee9ab1497441e378d77a5af6d Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 15:48:51 -0700 -Subject: [PATCH 78/84] Add BIOS boot measurement +Subject: [PATCH 79/85] Add BIOS boot measurement Measure the on-disk grub core on BIOS systems - unlike UEFI, the firmware can't do this stage for us. diff --git a/0079-Rework-linux-command.patch b/0080-Rework-linux-command.patch similarity index 96% rename from 0079-Rework-linux-command.patch rename to 0080-Rework-linux-command.patch index 766329fc..d5ef0e8f 100644 --- a/0079-Rework-linux-command.patch +++ b/0080-Rework-linux-command.patch @@ -1,7 +1,7 @@ -From ab08a3276ddccf99d51d57dca812e09618980828 Mon Sep 17 00:00:00 2001 +From 6ef376d234cf06ef3e92d77b03fa4060516a218c Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:12:39 -0700 -Subject: [PATCH 79/84] Rework linux command +Subject: [PATCH 80/85] 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 diff --git a/0080-Rework-linux16-command.patch b/0081-Rework-linux16-command.patch similarity index 96% rename from 0080-Rework-linux16-command.patch rename to 0081-Rework-linux16-command.patch index 1f716559..fe5efa92 100644 --- a/0080-Rework-linux16-command.patch +++ b/0081-Rework-linux16-command.patch @@ -1,7 +1,7 @@ -From 5440a125f295287f6fb998b7cecf6fd02712510d Mon Sep 17 00:00:00 2001 +From 9992eed98ad0d7d66444185a9cd2c81df5b4e1b2 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:20:58 -0700 -Subject: [PATCH 80/84] Rework linux16 command +Subject: [PATCH 81/85] 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 diff --git a/0081-Measure-kernel-and-initrd-on-BIOS-systems.patch b/0082-Measure-kernel-and-initrd-on-BIOS-systems.patch similarity index 94% rename from 0081-Measure-kernel-and-initrd-on-BIOS-systems.patch rename to 0082-Measure-kernel-and-initrd-on-BIOS-systems.patch index c46d034e..60ff8a8e 100644 --- a/0081-Measure-kernel-and-initrd-on-BIOS-systems.patch +++ b/0082-Measure-kernel-and-initrd-on-BIOS-systems.patch @@ -1,7 +1,7 @@ -From c84f92683520442e50b202a9802985a822d66277 Mon Sep 17 00:00:00 2001 +From f4d862215e8d693018f419be33a0a3a7c3e79d29 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:28:29 -0700 -Subject: [PATCH 81/84] Measure kernel and initrd on BIOS systems +Subject: [PATCH 82/85] Measure kernel and initrd on BIOS systems Measure the kernel and initrd when loaded on BIOS systems --- diff --git a/0082-Measure-the-kernel-commandline.patch b/0083-Measure-the-kernel-commandline.patch similarity index 89% rename from 0082-Measure-the-kernel-commandline.patch rename to 0083-Measure-the-kernel-commandline.patch index ba4e7937..d078457f 100644 --- a/0082-Measure-the-kernel-commandline.patch +++ b/0083-Measure-the-kernel-commandline.patch @@ -1,7 +1,7 @@ -From 06f8c94c7fdde72f435dc258f674da9ae7403e43 Mon Sep 17 00:00:00 2001 +From 6bcfc6f286d099a26cc0c7a00a6458d1d7993485 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:32:29 -0700 -Subject: [PATCH 82/84] Measure the kernel commandline +Subject: [PATCH 83/85] Measure the kernel commandline Measure the kernel commandline to ensure that it hasn't been modified --- diff --git a/0083-Measure-commands.patch b/0084-Measure-commands.patch similarity index 95% rename from 0083-Measure-commands.patch rename to 0084-Measure-commands.patch index d389a2d4..6f8795b0 100644 --- a/0083-Measure-commands.patch +++ b/0084-Measure-commands.patch @@ -1,7 +1,7 @@ -From 29c62ddf38164d307df69224f59ec183098cda94 Mon Sep 17 00:00:00 2001 +From 4f316cbb70563a26a8cb42ce5122c198cfd3636d Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Mon, 10 Aug 2015 15:27:12 -0700 -Subject: [PATCH 83/84] Measure commands +Subject: [PATCH 84/85] Measure commands Measure each command executed by grub, which includes script execution. --- diff --git a/0084-Measure-multiboot-images-and-modules.patch b/0085-Measure-multiboot-images-and-modules.patch similarity index 94% rename from 0084-Measure-multiboot-images-and-modules.patch rename to 0085-Measure-multiboot-images-and-modules.patch index 84b8e90f..80350d94 100644 --- a/0084-Measure-multiboot-images-and-modules.patch +++ b/0085-Measure-multiboot-images-and-modules.patch @@ -1,7 +1,7 @@ -From f3b10975f02c550752de2e759060d041aae1ff4b Mon Sep 17 00:00:00 2001 +From 85e100453d04e56088e4b9782d2f06dc0122587f Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 1 Sep 2015 16:02:55 -0700 -Subject: [PATCH 84/84] Measure multiboot images and modules +Subject: [PATCH 85/85] Measure multiboot images and modules --- grub-core/loader/i386/multiboot_mbi.c | 3 +++ diff --git a/grub.patches b/grub.patches index cd8733b7..7e92a42e 100644 --- a/grub.patches +++ b/grub.patches @@ -1,25 +1,25 @@ Patch0000: grub-2.02-beta3-to-origin-master.patch Patch0001: 0001-Fix-crash-on-http.patch -Patch0002: 0002-IBM-client-architecture-CAS-reboot-support.patch -Patch0003: 0003-Add-vlan-tag-support.patch -Patch0004: 0004-Add-X-option-to-printf-functions.patch -Patch0005: 0005-DHCP-client-ID-and-UUID-options-added.patch -Patch0006: 0006-Move-bash-completion-script-922997.patch -Patch0007: 0007-for-ppc-reset-console-display-attr-when-clear-screen.patch -Patch0008: 0008-Add-support-for-UEFI-operating-systems-returned-by-o.patch +Patch0002: 0002-Update-to-minilzo-2.08.patch +Patch0003: 0003-Failed-config-now-returns-exit-code-1252311.patch +Patch0004: 0004-DHCP-client-ID-and-UUID-options-added.patch +Patch0005: 0005-trim-arp-packets-with-abnormal-size.patch +Patch0006: 0006-Add-vlan-tag-support-on-IBM-PPC-machines.patch +Patch0007: 0007-IBM-client-architecture-CAS-reboot-support.patch +Patch0008: 0008-for-ppc-reset-console-display-attr-when-clear-screen.patch Patch0009: 0009-Disable-GRUB-video-support-for-IBM-power-machines.patch -Patch0010: 0010-Honor-a-symlink-when-generating-configuration-by-gru.patch -Patch0011: 0011-trim-arp-packets-with-abnormal-size.patch -Patch0012: 0012-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch -Patch0013: 0013-Add-GRUB_DISABLE_UUID.patch -Patch0014: 0014-Allow-fallback-to-include-entries-by-title-not-just-.patch -Patch0015: 0015-Update-to-minilzo-2.08.patch -Patch0016: 0016-Fix-bzr-s-ignore-artificats-in-.gitignore.patch -Patch0017: 0017-Make-exit-take-a-return-code.patch -Patch0018: 0018-Add-some-__unused__-where-gcc-5.x-is-more-picky-abou.patch -Patch0019: 0019-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch -Patch0020: 0020-Make-efi-machines-load-an-env-block-from-a-variable.patch -Patch0021: 0021-Failed-config-now-returns-exit-code-1252311.patch +Patch0010: 0010-Add-support-for-UEFI-operating-systems-returned-by-o.patch +Patch0011: 0011-Make-efi-machines-load-an-env-block-from-a-variable.patch +Patch0012: 0012-Make-exit-take-a-return-code.patch +Patch0013: 0013-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch +Patch0014: 0014-Fix-bzr-s-ignore-artificats-in-.gitignore.patch +Patch0015: 0015-Add-some-__unused__-where-gcc-5.x-is-more-picky-abou.patch +Patch0016: 0016-Move-bash-completion-script-922997.patch +Patch0017: 0017-Allow-fallback-to-include-entries-by-title-not-just-.patch +Patch0018: 0018-Honor-a-symlink-when-generating-configuration-by-gru.patch +Patch0019: 0019-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch +Patch0020: 0020-Add-GRUB_DISABLE_UUID.patch +Patch0021: 0021-Add-X-option-to-printf-functions.patch Patch0022: 0022-Migrate-PPC-from-Yaboot-to-Grub2.patch Patch0023: 0023-Add-fw_path-variable-revised.patch Patch0024: 0024-Add-support-for-linuxefi.patch @@ -56,30 +56,31 @@ Patch0054: 0054-Fix-convert-function-to-support-NVMe-devices.patch Patch0055: 0055-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch Patch0056: 0056-Use-the-default-device-tree-from-the-grub-default-fi.patch Patch0057: 0057-reopen-SNP-protocol-for-exclusive-use-by-grub.patch -Patch0058: 0058-Add-grub_util_readlink.patch -Patch0059: 0059-Make-editenv-chase-symlinks-including-those-across-d.patch -Patch0060: 0060-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch -Patch0061: 0061-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch -Patch0062: 0062-Load-arm-with-SB-enabled.patch -Patch0063: 0063-Try-prefix-if-fw_path-doesn-t-work.patch -Patch0064: 0064-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch -Patch0065: 0065-Make-grub2-mkconfig-construct-titles-that-look-like-.patch -Patch0066: 0066-Update-info-with-grub.cfg-netboot-selection-order-11.patch -Patch0067: 0067-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch -Patch0068: 0068-Add-friendly-grub2-password-config-tool-985962.patch -Patch0069: 0069-Fix-race-in-EFI-validation.patch -Patch0070: 0070-ppc64le-sync-mkconfig-to-disk-1212114.patch -Patch0071: 0071-Use-device-part-of-chainloader-target-if-present.patch -Patch0072: 0072-Add-secureboot-support-on-efi-chainloader.patch -Patch0073: 0073-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch -Patch0074: 0074-Fix-security-issue-when-reading-username-and-passwor.patch -Patch0075: 0075-Make-grub_fatal-also-backtrace.patch -Patch0076: 0076-Core-TPM-support.patch -Patch0077: 0077-Measure-kernel-initrd.patch -Patch0078: 0078-Add-BIOS-boot-measurement.patch -Patch0079: 0079-Rework-linux-command.patch -Patch0080: 0080-Rework-linux16-command.patch -Patch0081: 0081-Measure-kernel-and-initrd-on-BIOS-systems.patch -Patch0082: 0082-Measure-the-kernel-commandline.patch -Patch0083: 0083-Measure-commands.patch -Patch0084: 0084-Measure-multiboot-images-and-modules.patch +Patch0058: 0058-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +Patch0059: 0059-Add-grub_util_readlink.patch +Patch0060: 0060-Make-editenv-chase-symlinks-including-those-across-d.patch +Patch0061: 0061-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch +Patch0062: 0062-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch +Patch0063: 0063-Load-arm-with-SB-enabled.patch +Patch0064: 0064-Try-prefix-if-fw_path-doesn-t-work.patch +Patch0065: 0065-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch +Patch0066: 0066-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +Patch0067: 0067-Update-info-with-grub.cfg-netboot-selection-order-11.patch +Patch0068: 0068-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch +Patch0069: 0069-Add-friendly-grub2-password-config-tool-985962.patch +Patch0070: 0070-Fix-race-in-EFI-validation.patch +Patch0071: 0071-ppc64le-sync-mkconfig-to-disk-1212114.patch +Patch0072: 0072-Use-device-part-of-chainloader-target-if-present.patch +Patch0073: 0073-Add-secureboot-support-on-efi-chainloader.patch +Patch0074: 0074-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch +Patch0075: 0075-Fix-security-issue-when-reading-username-and-passwor.patch +Patch0076: 0076-Make-grub_fatal-also-backtrace.patch +Patch0077: 0077-Core-TPM-support.patch +Patch0078: 0078-Measure-kernel-initrd.patch +Patch0079: 0079-Add-BIOS-boot-measurement.patch +Patch0080: 0080-Rework-linux-command.patch +Patch0081: 0081-Rework-linux16-command.patch +Patch0082: 0082-Measure-kernel-and-initrd-on-BIOS-systems.patch +Patch0083: 0083-Measure-the-kernel-commandline.patch +Patch0084: 0084-Measure-commands.patch +Patch0085: 0085-Measure-multiboot-images-and-modules.patch diff --git a/grub2.spec b/grub2.spec index af1fa3fc..93c4db24 100644 --- a/grub2.spec +++ b/grub2.spec @@ -57,12 +57,10 @@ Source0: ftp://alpha.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz Source5: theme.tar.bz2 Source6: gitignore +Source7: grub.patches # generate with do-rebase -%include grub.patches - - - +%include %{SOURCE7} # And these are: # git checkout debuginfo