rpms/grub2
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/grub2.git synced 2024-11-28 15:46:53 +00:00
Code Issues 24 Projects 4 Releases Packages Wiki Activity Actions

Fix rebase error.

Browse source 
Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2018-04-06 16:02:01 -04:00
parent da1991e3f0
commit a8a2f78331
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
0223-Measure-multiboot-images-and-modules.patch
View file

@ -1,4 +1,4 @@
From 98dd154527b9cddaff15ab22b35c41815d9f1b13 Mon Sep 17 00:00:00 2001 From 484c55d3bce0697de94d6dfd52aa8b8a92334aab Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59@coreos.com> From: Matthew Garrett <mjg59@coreos.com>
Date: Tue, 1 Sep 2015 16:02:55 -0700 Date: Tue, 1 Sep 2015 16:02:55 -0700
Subject: [PATCH 223/227] Measure multiboot images and modules Subject: [PATCH 223/227] Measure multiboot images and modules
@ -51,7 +51,7 @@ index fb044a60c79..0ca525380c9 100644
} }
diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
index b0679a9f6c9..a7b4a57ec4f 100644 index b0679a9f6c9..99ef9036423 100644
--- a/grub-core/loader/multiboot_mbi2.c --- a/grub-core/loader/multiboot_mbi2.c
+++ b/grub-core/loader/multiboot_mbi2.c +++ b/grub-core/loader/multiboot_mbi2.c
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
@ -66,7 +66,7 @@ index b0679a9f6c9..a7b4a57ec4f 100644
COMPILE_TIME_ASSERT (MULTIBOOT_HEADER_ALIGN % 4 == 0); COMPILE_TIME_ASSERT (MULTIBOOT_HEADER_ALIGN % 4 == 0);
+ grub_tpm_measure ((unsigned char *)buffer, len, GRUB_KERNEL_PCR, filename); + grub_tpm_measure ((unsigned char *)mld.buffer, len, GRUB_KERNEL_PCR, filename);
+ +
header = find_header (mld.buffer, len); header = find_header (mld.buffer, len);
- -

2
0224-Fix-boot-when-there-s-no-TPM.patch
View file

@ -1,4 +1,4 @@
From d621b990b2d3ba20a275de963841c4c2c9246a90 Mon Sep 17 00:00:00 2001 From 762607552528db56dedafac9825cab144c27eba3 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59@coreos.com> From: Matthew Garrett <mjg59@coreos.com>
Date: Wed, 23 Mar 2016 16:49:42 -0700 Date: Wed, 23 Mar 2016 16:49:42 -0700
Subject: [PATCH 224/227] Fix boot when there's no TPM Subject: [PATCH 224/227] Fix boot when there's no TPM

8
0225-Rework-TPM-measurements.patch
View file

@ -1,4 +1,4 @@
From eb631580edb7cd1ed00de0a521373d363651be41 Mon Sep 17 00:00:00 2001 From 654614fc2a0b075bc94907a58469c4df05f81994 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59@coreos.com> From: Matthew Garrett <mjg59@coreos.com>
Date: Wed, 23 Mar 2016 17:03:43 -0700 Date: Wed, 23 Mar 2016 17:03:43 -0700
Subject: [PATCH 225/227] Rework TPM measurements Subject: [PATCH 225/227] Rework TPM measurements
@ -160,15 +160,15 @@ index 0ca525380c9..cc53d429bca 100644
} }
diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
index a7b4a57ec4f..f43482935cb 100644 index 99ef9036423..f7e333f56c1 100644
--- a/grub-core/loader/multiboot_mbi2.c --- a/grub-core/loader/multiboot_mbi2.c
+++ b/grub-core/loader/multiboot_mbi2.c +++ b/grub-core/loader/multiboot_mbi2.c
@@ -132,7 +132,7 @@ grub_multiboot_load (grub_file_t file, const char *filename) @@ -132,7 +132,7 @@ grub_multiboot_load (grub_file_t file, const char *filename)
COMPILE_TIME_ASSERT (MULTIBOOT_HEADER_ALIGN % 4 == 0); COMPILE_TIME_ASSERT (MULTIBOOT_HEADER_ALIGN % 4 == 0);
- grub_tpm_measure ((unsigned char *)buffer, len, GRUB_KERNEL_PCR, filename); - grub_tpm_measure ((unsigned char *)mld.buffer, len, GRUB_KERNEL_PCR, filename);
+ grub_tpm_measure ((unsigned char *)buffer, len, GRUB_BINARY_PCR, "grub_multiboot", filename); + grub_tpm_measure ((unsigned char *)mld.buffer, len, GRUB_BINARY_PCR, "grub_multiboot", filename);
header = find_header (mld.buffer, len); header = find_header (mld.buffer, len);
if (header == 0) if (header == 0)

2
0226-Fix-event-log-prefix.patch
View file

@ -1,4 +1,4 @@
From 4caddfad92ef6fa251fbfaf7e10271434885f253 Mon Sep 17 00:00:00 2001 From 8e7dae020dc6e789df42f8bc3ca73cbaa39af017 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59@coreos.com> From: Matthew Garrett <mjg59@coreos.com>
Date: Tue, 29 Mar 2016 15:36:49 -0700 Date: Tue, 29 Mar 2016 15:36:49 -0700
Subject: [PATCH 226/227] Fix event log prefix Subject: [PATCH 226/227] Fix event log prefix

2
0227-Set-the-first-boot-menu-entry-as-default-when-using-.patch
View file

@ -1,4 +1,4 @@
From 5d9681adc296936bea6d070c4b93db42741f05ff Mon Sep 17 00:00:00 2001 From a155931ed02d4517d9dba298f5c8da45fa9e7577 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javierm@redhat.com> From: Javier Martinez Canillas <javierm@redhat.com>
Date: Fri, 6 Apr 2018 14:08:36 +0200 Date: Fri, 6 Apr 2018 14:08:36 +0200
Subject: [PATCH 227/227] Set the first boot menu entry as default when using Subject: [PATCH 227/227] Set the first boot menu entry as default when using