Slightly better debugging messages

Signed-off-by: Peter Jones <pjones@redhat.com>
Upstream-commit-id: 173d35fe8f5
This commit is contained in:
Peter Jones 2019-11-18 13:59:14 -05:00
parent 58df8d745c
commit 5e6e0792ce

14
shim.c
View File

@ -2459,6 +2459,8 @@ uninstall_shim_protocols(void)
EFI_STATUS EFI_STATUS
shim_init(void) shim_init(void)
{ {
EFI_STATUS efi_status;
setup_verbosity(); setup_verbosity();
dprint(L"%a", shim_version); dprint(L"%a", shim_version);
@ -2479,7 +2481,12 @@ shim_init(void)
} }
hook_exit(systab); hook_exit(systab);
return install_shim_protocols();
efi_status = install_shim_protocols();
if (EFI_ERROR(efi_status))
perror(L"install_shim_protocols() failed: %r\n", efi_status);
return efi_status;
} }
void void
@ -2575,13 +2582,12 @@ efi_main (EFI_HANDLE passed_image_handle, EFI_SYSTEM_TABLE *passed_systab)
build_cert = shim_cert; build_cert = shim_cert;
#endif /* defined(ENABLE_SHIM_CERT) */ #endif /* defined(ENABLE_SHIM_CERT) */
CHAR16 *msgs[] = { CHAR16 *msgs[] = {
L"import_mok_state() failed\n", L"import_mok_state() failed",
L"shim_int() failed\n", L"shim_init() failed",
NULL NULL
}; };
int msg = 0; int msg = 0;
/* /*
* Set up the shim lock protocol so that grub and MokManager can * Set up the shim lock protocol so that grub and MokManager can
* call back in and use shim functions * call back in and use shim functions