From c2f010393b0ec1128be1a5d6bea90d10561b384d Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Tue, 25 Aug 2020 17:54:05 +0000 Subject: [PATCH] efi_loader: log messages for bootefi command Write log messages when booting via the bootefi command to allow tracking on the syslog server. Example messages are Booting /snp.efi or Booting /MemoryMapped(0x0,0x4fe00000,0x35a40) Loading image failed Signed-off-by: Heinrich Schuchardt --- cmd/bootefi.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 06563d28ca..40d5ef2b3a 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -433,7 +433,9 @@ efi_status_t efi_run_image(void *source_buffer, efi_uintn_t source_size) { efi_handle_t mem_handle = NULL, handle; struct efi_device_path *file_path = NULL; + struct efi_device_path *msg_path; efi_status_t ret; + u16 *load_options; if (!bootefi_device_path || !bootefi_image_path) { /* @@ -456,17 +458,21 @@ efi_status_t efi_run_image(void *source_buffer, efi_uintn_t source_size) file_path); if (ret != EFI_SUCCESS) goto out; + msg_path = file_path; } else { file_path = efi_dp_append(bootefi_device_path, bootefi_image_path); + msg_path = bootefi_image_path; } + log_info("Booting %pD\n", msg_path); + ret = EFI_CALL(efi_load_image(false, efi_root, file_path, source_buffer, source_size, &handle)); - if (ret != EFI_SUCCESS) + if (ret != EFI_SUCCESS) { + log_err("Loading image failed\n"); goto out; - - u16 *load_options; + } /* Transfer environment variable as load options */ ret = efi_env_set_load_options(handle, "bootargs", &load_options); -- 2.39.5