summaryrefslogtreecommitdiff
path: root/src/boot/efi
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2015-02-26 01:15:18 +0100
committerKay Sievers <kay@vrfy.org>2015-02-26 01:15:18 +0100
commit20b1538df606174d082d00cff29b2dc2b0771453 (patch)
treedf178f4b25f96b4fde6069a36f187b0f62ea7f19 /src/boot/efi
parenta19b0678be6f105d1bb1aae151fcb907ea6e832a (diff)
boot: efi - print generic error message if we fail to execute an image
Diffstat (limited to 'src/boot/efi')
-rw-r--r--src/boot/efi/boot.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index 02b8a5080c..e739e9412b 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -1937,14 +1937,8 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
uefi_call_wrapper(BS->SetWatchdogTimer, 4, 5 * 60, 0x10000, 0, NULL);
err = image_start(image, &config, entry);
-
- if (err == EFI_ACCESS_DENIED || err == EFI_SECURITY_VIOLATION) {
- /* Platform is secure boot and requested image isn't
- * trusted. Need to go back to prior boot system and
- * install more keys or hashes. Signal failure by
- * returning the error */
- Print(L"\nImage %s gives a security error\n", entry->title);
- Print(L"Please enrol the hash or signature of %s\n", entry->loader);
+ if (EFI_ERROR(err)) {
+ Print(L"\nFailed to execute %s (%s): %r\n", entry->title, entry->loader, err);
uefi_call_wrapper(BS->Stall, 1, 3 * 1000 * 1000);
goto out;
}