Re: [PATCH v2] wic: bootimg-efi-isar: fix generating of grub.cfg for custom initrd

[Uladzimir Bely <ubely@ilbers.de>]

On Fri, 2025-01-10 at 21:30 +0100, peter.czegledy via isar-users wrote:
> From: Peter Czegledy <peter.czegledy@evosoft.com>
> 
> Specifying the initrd location via WICs sourceparams initrd argument
> doesn't generate the initrd location properly in case of grub-efi
> loader.
> 
> This fixes that and unifies the custom initrd handling for grub-efi
> and systemd-boots.
> 
> Signed-off-by: Peter Czegledy <peter.czegledy@evosoft.com>
> ---
>  .../lib/wic/plugins/source/bootimg-efi-isar.py       | 12 +++++++---
> --
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
> b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
> index 50f4187d..78ae4fb2 100644
> --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
> +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
> @@ -108,9 +108,12 @@ class BootimgEFIPlugin(SourcePlugin):
>              if label:
>                  label_conf = "LABEL=%s" % label
>  
> -            kernel, initrd = isar_get_filenames(
> +            kernel, default_initrd = isar_get_filenames(
>                  get_bitbake_var("IMAGE_ROOTFS"),
> get_bitbake_var("KERNEL_FILE")
>              )
> +            if not initrd:
> +                initrd = default_initrd
> +
>              grubefi_conf += "linux /%s %s rootwait %s\n" \
>                  % (kernel, label_conf, bootloader.append)
>  
> @@ -187,12 +190,11 @@ class BootimgEFIPlugin(SourcePlugin):
>  
>              title = source_params.get('title')
>  
> -            temp_initrd = initrd
> -            kernel, initrd = isar_get_filenames(
> +            kernel, default_initrd = isar_get_filenames(
>                  get_bitbake_var("IMAGE_ROOTFS"),
> get_bitbake_var("KERNEL_FILE")
>              )
> -            if temp_initrd:
> -                initrd = temp_initrd
> +            if not initrd:
> +                initrd = default_initrd
>  
>              boot_conf = ""
>              boot_conf += "title %s\n" % (title if title else "boot")
> -- 
> 2.39.5
> 

Applied to next, thanks.

-- 
Best regards,
Uladzimir.



-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/ecbf388ca0bf8a62a0b16577a519ed368979f091.camel%40ilbers.de.