efi_loader: print file path w/o boot device

Helloworld.efi should print the file path even if the boot device is
not set.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt
2023-05-12 21:23:15 +02:00
parent 7dfab39855
commit 31eda3f55c

View File

@@ -216,6 +216,10 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle,
(con_out, u"Cannot open device path to text protocol\r\n"); (con_out, u"Cannot open device path to text protocol\r\n");
goto out; goto out;
} }
con_out->output_string(con_out, u"File path: ");
ret = print_device_path(loaded_image->file_path, device_path_to_text);
if (ret != EFI_SUCCESS)
goto out;
if (!loaded_image->device_handle) { if (!loaded_image->device_handle) {
con_out->output_string con_out->output_string
(con_out, u"Missing device handle\r\n"); (con_out, u"Missing device handle\r\n");
@@ -234,10 +238,6 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle,
ret = print_device_path(device_path, device_path_to_text); ret = print_device_path(device_path, device_path_to_text);
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
goto out; goto out;
con_out->output_string(con_out, u"File path: ");
ret = print_device_path(loaded_image->file_path, device_path_to_text);
if (ret != EFI_SUCCESS)
goto out;
out: out:
boottime->exit(handle, ret, 0, NULL); boottime->exit(handle, ret, 0, NULL);