X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fboot%2Fefi%2Fboot.c;fp=src%2Fboot%2Fefi%2Fboot.c;h=e739e9412bb04e9f3e89255b2787d3dc78a7d990;hp=02b8a5080c38621dbcf6870eb352f0e8125ba537;hb=20b1538df606174d082d00cff29b2dc2b0771453;hpb=a19b0678be6f105d1bb1aae151fcb907ea6e832a

diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index 02b8a5080..e739e9412 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;
                 }