From 20b1538df606174d082d00cff29b2dc2b0771453 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 26 Feb 2015 01:15:18 +0100 Subject: boot: efi - print generic error message if we fail to execute an image --- src/boot/efi/boot.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/boot') 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; } -- cgit v1.2.3-54-g00ecf