forked from pool/grub2
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
|
From eaed36ac87c3f8edeea67bf333700819e80ac732 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael Chang <mchang@suse.com>
|
||
|
|
Date: Fri, 5 Mar 2021 17:33:17 +0800
|
||
|
|
Subject: [PATCH] Add chainloaded image as shim's verifiable object
|
||
|
|
|
||
|
|
This fixed error in dual booting Microsoft Windows
|
||
|
|
|
||
|
|
error ../../grub-core/kern/verifiers.c:119:verification requested but
|
||
|
|
nobody cares: /EFI/Microsoft/Boot/bootmgfw.efi.
|
||
|
|
---
|
||
|
|
grub-core/kern/efi/sb.c | 1 +
|
||
|
|
grub-core/kern/lockdown.c | 1 -
|
||
|
|
2 files changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c
|
||
|
|
index 41dadcd14..96d237722 100644
|
||
|
|
--- a/grub-core/kern/efi/sb.c
|
||
|
|
+++ b/grub-core/kern/efi/sb.c
|
||
|
|
@@ -129,6 +129,7 @@ shim_lock_verifier_init (grub_file_t io __attribute__ ((unused)),
|
||
|
|
case GRUB_FILE_TYPE_BSD_KERNEL:
|
||
|
|
case GRUB_FILE_TYPE_XNU_KERNEL:
|
||
|
|
case GRUB_FILE_TYPE_PLAN9_KERNEL:
|
||
|
|
+ case GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE:
|
||
|
|
*flags = GRUB_VERIFY_FLAGS_SINGLE_CHUNK;
|
||
|
|
|
||
|
|
/* Fall through. */
|
||
|
|
diff --git a/grub-core/kern/lockdown.c b/grub-core/kern/lockdown.c
|
||
|
|
index 0bc70fd42..e1fd1c1e2 100644
|
||
|
|
--- a/grub-core/kern/lockdown.c
|
||
|
|
+++ b/grub-core/kern/lockdown.c
|
||
|
|
@@ -48,7 +48,6 @@ lockdown_verifier_init (grub_file_t io __attribute__ ((unused)),
|
||
|
|
case GRUB_FILE_TYPE_PXECHAINLOADER:
|
||
|
|
case GRUB_FILE_TYPE_PCCHAINLOADER:
|
||
|
|
case GRUB_FILE_TYPE_COREBOOT_CHAINLOADER:
|
||
|
|
- case GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE:
|
||
|
|
case GRUB_FILE_TYPE_ACPI_TABLE:
|
||
|
|
case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE:
|
||
|
|
*flags = GRUB_VERIFY_FLAGS_DEFER_AUTH;
|
||
|
|
--
|
||
|
|
2.26.2
|
||
|
|
|