|
 |
d84fc6 |
From 5e6e0792cedb3b71cbe061ae56e96906cf710579 Mon Sep 17 00:00:00 2001
|
|
|
d84fc6 |
From: Peter Jones <pjones@redhat.com>
|
|
|
d84fc6 |
Date: Mon, 18 Nov 2019 13:59:14 -0500
|
|
|
d84fc6 |
Subject: [PATCH 42/62] Slightly better debugging messages
|
|
|
d84fc6 |
|
|
|
d84fc6 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
d84fc6 |
Upstream-commit-id: 173d35fe8f5
|
|
|
d84fc6 |
---
|
|
|
d84fc6 |
shim.c | 14 ++++++++++----
|
|
|
d84fc6 |
1 file changed, 10 insertions(+), 4 deletions(-)
|
|
|
d84fc6 |
|
|
|
d84fc6 |
diff --git a/shim.c b/shim.c
|
|
|
d84fc6 |
index d7ee2b6de6f..2f7aba07421 100644
|
|
|
d84fc6 |
--- a/shim.c
|
|
|
d84fc6 |
+++ b/shim.c
|
|
|
d84fc6 |
@@ -2459,6 +2459,8 @@ uninstall_shim_protocols(void)
|
|
|
d84fc6 |
EFI_STATUS
|
|
|
d84fc6 |
shim_init(void)
|
|
|
d84fc6 |
{
|
|
|
d84fc6 |
+ EFI_STATUS efi_status;
|
|
|
d84fc6 |
+
|
|
|
d84fc6 |
setup_verbosity();
|
|
|
d84fc6 |
dprint(L"%a", shim_version);
|
|
|
d84fc6 |
|
|
|
d84fc6 |
@@ -2479,7 +2481,12 @@ shim_init(void)
|
|
|
d84fc6 |
}
|
|
|
d84fc6 |
|
|
|
d84fc6 |
hook_exit(systab);
|
|
|
d84fc6 |
- return install_shim_protocols();
|
|
|
d84fc6 |
+
|
|
|
d84fc6 |
+ efi_status = install_shim_protocols();
|
|
|
d84fc6 |
+ if (EFI_ERROR(efi_status))
|
|
|
d84fc6 |
+ perror(L"install_shim_protocols() failed: %r\n", efi_status);
|
|
|
d84fc6 |
+
|
|
|
d84fc6 |
+ return efi_status;
|
|
|
d84fc6 |
}
|
|
|
d84fc6 |
|
|
|
d84fc6 |
void
|
|
|
d84fc6 |
@@ -2575,13 +2582,12 @@ efi_main (EFI_HANDLE passed_image_handle, EFI_SYSTEM_TABLE *passed_systab)
|
|
|
d84fc6 |
build_cert = shim_cert;
|
|
|
d84fc6 |
#endif /* defined(ENABLE_SHIM_CERT) */
|
|
|
d84fc6 |
CHAR16 *msgs[] = {
|
|
|
d84fc6 |
- L"import_mok_state() failed\n",
|
|
|
d84fc6 |
- L"shim_int() failed\n",
|
|
|
d84fc6 |
+ L"import_mok_state() failed",
|
|
|
d84fc6 |
+ L"shim_init() failed",
|
|
|
d84fc6 |
NULL
|
|
|
d84fc6 |
};
|
|
|
d84fc6 |
int msg = 0;
|
|
|
d84fc6 |
|
|
|
d84fc6 |
-
|
|
|
d84fc6 |
/*
|
|
|
d84fc6 |
* Set up the shim lock protocol so that grub and MokManager can
|
|
|
d84fc6 |
* call back in and use shim functions
|
|
|
d84fc6 |
--
|
|
|
d84fc6 |
2.26.2
|
|
|
d84fc6 |
|