mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 22:35:28 +00:00
359c2df03d
For EFI systems, the BLS fragments were stored in the EFI System Partition (ESP) while in non-EFI systems it was stored in /boot. For consistency, it's better to always store the BLS fragments in the same path regardless of the firmware interface used. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
29 lines
944 B
Diff
29 lines
944 B
Diff
From 0816621235226952a5bd0cfd027eb97ff84df547 Mon Sep 17 00:00:00 2001
|
|
From: Matthew Garrett <mjg59@coreos.com>
|
|
Date: Tue, 29 Mar 2016 15:36:49 -0700
|
|
Subject: [PATCH 225/249] Fix event log prefix
|
|
|
|
We're not passing the prefixed version of the description to the event log.
|
|
Fix that.
|
|
|
|
(cherry picked from commit aab446306b8a78c741e229861c4988738cfc6426)
|
|
---
|
|
grub-core/kern/tpm.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/kern/tpm.c b/grub-core/kern/tpm.c
|
|
index cb5a812035d..e5e8fced624 100644
|
|
--- a/grub-core/kern/tpm.c
|
|
+++ b/grub-core/kern/tpm.c
|
|
@@ -13,7 +13,7 @@ grub_tpm_measure (unsigned char *buf, grub_size_t size, grub_uint8_t pcr,
|
|
char *desc = grub_xasprintf("%s %s", kind, description);
|
|
if (!desc)
|
|
return GRUB_ERR_OUT_OF_MEMORY;
|
|
- ret = grub_tpm_log_event(buf, size, pcr, description);
|
|
+ ret = grub_tpm_log_event(buf, size, pcr, desc);
|
|
grub_free(desc);
|
|
return ret;
|
|
}
|
|
--
|
|
2.17.1
|
|
|