1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
27 lines
924 B
Diff
27 lines
924 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Matthew Garrett <mjg59@coreos.com>
|
|
Date: Tue, 29 Mar 2016 15:36:49 -0700
|
|
Subject: [PATCH] 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;
|
|
}
|