summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Garrett <mjg@redhat.com>2012-10-12 19:55:20 -0400
committerMatthew Garrett <mjg@redhat.com>2012-10-12 19:55:20 -0400
commit683959d7ad8c8543d006d5a915603fa30465971b (patch)
tree56ebc570bf617799e84a04acbedc02e2f85de04c
parent0a6565c5ed2f3943657f3c9ad919721d7300e5b3 (diff)
downloadefi-boot-shim-683959d7ad8c8543d006d5a915603fa30465971b.tar.gz
efi-boot-shim-683959d7ad8c8543d006d5a915603fa30465971b.zip
Remove LoadImage/StartImage support
Some systems will show an error dialog if LoadImage() returned EFI_ACCESS_DENIED, which then requires physical user interaction to skip. Let's just remove the LoadImage/StartImage code, since the built-in code is theoretically equivalent.
-rw-r--r--shim.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/shim.c b/shim.c
index c1af0c8f..4eab87ac 100644
--- a/shim.c
+++ b/shim.c
@@ -941,7 +941,6 @@ EFI_STATUS start_image(EFI_HANDLE image_handle, CHAR16 *ImagePath)
EFI_GUID loaded_image_protocol = LOADED_IMAGE_PROTOCOL;
EFI_STATUS efi_status;
EFI_LOADED_IMAGE *li, li_bak;
- EFI_HANDLE handle = NULL;
EFI_DEVICE_PATH *path;
CHAR16 *PathName;
void *data = NULL;
@@ -962,18 +961,6 @@ EFI_STATUS start_image(EFI_HANDLE image_handle, CHAR16 *ImagePath)
goto done;
}
- efi_status = uefi_call_wrapper(BS->LoadImage, 6, FALSE, image_handle,
- path, NULL, 0, &handle);
-
- if (efi_status == EFI_SUCCESS) {
- /* Image validates - start it */
- Print(L"Starting file via StartImage\n");
- efi_status = uefi_call_wrapper(BS->StartImage, 3, handle, NULL,
- NULL);
- uefi_call_wrapper(BS->UnloadImage, 1, handle);
- goto done;
- }
-
efi_status = load_image(li, &data, &datasize, PathName);
if (efi_status != EFI_SUCCESS) {