[PATCH v5 2/3] Boot var automatic management for removable medias

[Heinrich Schuchardt]

On 5/26/23 00:04, Raymond Mao wrote:
> Changes for complying to EFI spec §3.5.1.1
> 'Removable Media Boot Behavior'.
> Boot variables can be automatically generated during a removable
> media is probed. At the same time, unused boot variables will be
> detected and removed.
>
> Signed-off-by: Raymond Mao <raymond.mao at linaro.org>
> ---
> Changes in v2
> - Ignore EFI_NOT_FOUND returned from
>    efi_bootmgr_update_media_device_boot_option which means no boot
>    options scanned.
> Changes in v3
> - Split the patch into moving and renaming functions and
>    individual patches for each changed functionality
> Changes in v4
> - Revert the change of introducing a bool parameter when updating
>    the boot option. Use short-form of device path by default
> Changes in v5
> - Move function call of efi_bootmgr_update_media_device_boot_option()
>    from efi_init_variables() to efi_init_obj_list()
> - Add warning log when a short-form device path doesn't exist

This change history does not reflect this patch. Please, describe
overall changes in the cover-letter and individual changes in the
respective patch.

>
>   lib/efi_loader/efi_disk.c     | 7 +++++++
>   lib/efi_loader/efi_setup.c    | 5 +++++
>   lib/efi_loader/efi_variable.c | 1 -
>   3 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
> index d2256713a8..ca5f07f2ec 100644
> --- a/lib/efi_loader/efi_disk.c
> +++ b/lib/efi_loader/efi_disk.c
> @@ -687,6 +687,13 @@ int efi_disk_probe(void *ctx, struct event *event)
>   			return -1;
>   	}
>
> +	/* only do the boot option management when UEFI sub-system is initialized */
> +	if (efi_obj_list_initialized == EFI_SUCCESS) {
> +		ret = efi_bootmgr_update_media_device_boot_option();
> +		if (ret != EFI_SUCCESS && ret != EFI_NOT_FOUND)
> +			return -1;
> +	}
> +
>   	return 0;
>   }
>
> diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
> index 58d4e13402..4686374995 100644
> --- a/lib/efi_loader/efi_setup.c
> +++ b/lib/efi_loader/efi_setup.c
> @@ -245,6 +245,11 @@ efi_status_t efi_init_obj_list(void)
>   	if (ret != EFI_SUCCESS)
>   		goto out;
>
> +	/* update boot option after variable service initialized */
> +	ret = efi_bootmgr_update_media_device_boot_option();
> +	if (ret != EFI_SUCCESS && ret != EFI_NOT_FOUND)
> +		goto out;
> +
>   	/* Define supported languages */
>   	ret = efi_init_platform_lang();
>   	if (ret != EFI_SUCCESS)
> diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c
> index be95ed44e6..1529fffd1d 100644
> --- a/lib/efi_loader/efi_variable.c
> +++ b/lib/efi_loader/efi_variable.c
> @@ -476,6 +476,5 @@ efi_status_t efi_init_variables(void)
>   			log_err("Invalid EFI variable seed\n");
>   	}
>
> -

Please, avoid unrelated changes.

Best regards

Heinrich

>   	return efi_init_secure_state();
>   }