forked from pool/grub2
3e026f665c
- Add safety measure to pcr snapshot by checking platform and tpm status * safe_tpm_pcr_snapshot.patch - Fix installation failure due to unavailable nvram device on ppc64le (bsc#1201361) * 0001-grub-install-set-point-of-no-return-for-powerpc-ieee1275.patch - Add patches to dynamically allocate additional memory regions for EFI systems (bsc#1202438) * 0001-mm-Allow-dynamically-requesting-additional-memory-re.patch * 0002-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch * 0003-kern-efi-mm-Extract-function-to-add-memory-regions.patch * 0004-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch * 0005-kern-efi-mm-Implement-runtime-addition-of-pages.patch - Enlarge the default heap size and defer the disk cache invalidation (bsc#1202438) * 0001-kern-efi-mm-Enlarge-the-default-heap-size.patch * 0002-mm-Defer-the-disk-cache-invalidation.patch - Add patches for ALP FDE support * 0001-devmapper-getroot-Have-devmapper-recognize-LUKS2.patch * 0002-devmapper-getroot-Set-up-cheated-LUKS2-cryptodisk-mo.patch * 0003-disk-cryptodisk-When-cheatmounting-use-the-sector-in.patch * 0004-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch * 0005-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch * 0006-EFI-console-Do-not-set-colorstate-until-the-first-te.patch * 0007-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch * 0008-linuxefi-Use-common-grub_initrd_load.patch * 0009-Add-crypttab_entry-to-obviate-the-need-to-input-pass.patch * 0010-templates-import-etc-crypttab-to-grub.cfg.patch OBS-URL: https://build.opensuse.org/request/show/1004537 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=419
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
Index: grub-2.06/grub-core/tpm2/module.c
|
|
===================================================================
|
|
--- grub-2.06.orig/grub-core/tpm2/module.c
|
|
+++ grub-2.06/grub-core/tpm2/module.c
|
|
@@ -22,6 +22,7 @@
|
|
#include <grub/misc.h>
|
|
#include <grub/mm.h>
|
|
#include <grub/protector.h>
|
|
+#include <grub/time.h>
|
|
#include <grub/tpm2/buffer.h>
|
|
#include <grub/tpm2/internal/args.h>
|
|
#include <grub/tpm2/mu.h>
|
|
@@ -449,6 +450,7 @@ grub_tpm2_protector_srk_recover (const s
|
|
{
|
|
grub_error (err, N_("Failed to unseal sealed key (TPM2_Unseal failed "
|
|
"with TSS/TPM error %u)"), rc);
|
|
+ grub_millisleep(500);
|
|
goto exit4;
|
|
}
|
|
|
|
@@ -461,6 +463,8 @@ grub_tpm2_protector_srk_recover (const s
|
|
goto exit4;
|
|
}
|
|
|
|
+ grub_printf("TPM2: unsealed %u bytes of key material\n", data.size);
|
|
+
|
|
if (ctx->efivar)
|
|
{
|
|
rc = grub_tpm2_protector_publish_key (data.buffer, data.size, ctx->efivar);
|
|
Index: grub-2.06/grub-core/loader/linux.c
|
|
===================================================================
|
|
--- grub-2.06.orig/grub-core/loader/linux.c
|
|
+++ grub-2.06/grub-core/loader/linux.c
|
|
@@ -171,6 +171,7 @@ grub_initrd_component (const char *buf,
|
|
struct grub_linux_initrd_component *comp = initrd_ctx->components + initrd_ctx->nfiles;
|
|
grub_size_t dir_size, name_len;
|
|
|
|
+ grub_printf("Creating initrd component \"%s\" with %u bytes\n", newc_name, bufsz);
|
|
while (*newc_name == '/')
|
|
newc_name++;
|
|
|