Re: [PATCH] wic/plugins/bootimg-efi-isar: Use initrd from source params

[Uladzimir Bely <ubely@ilbers.de>]

On Thu, 2024-01-25 at 12:06 +0000, 'MOESSBAUER, Felix' via isar-users
wrote:
> On Thu, 2024-01-25 at 11:55 +0100, 'Quirin Gylstorff' via isar-users
> wrote:
> > From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> > 
> > This fixes the issue that you can add a initrd with the source
> > params
> > but it will still boot the initial initrd.
> > 
> > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> > ---
> >  meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 5 +++++
> >  1 file changed, 5 insertions(+)
> > 
> > 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 b934d0c7..27d40756 100644
> > --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
> > +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
> > @@ -185,7 +185,12 @@ class BootimgEFIPlugin(SourcePlugin):
> >  
> >              title = source_params.get('title')
> >  
> > +            temp_initrd = None
> > +            if initrd:
> > +                temp_initrd = initrd
> 
> Why not simply temp_initrd = initrd ?
> 
> Anyways, the logic itself is fine.
> 
> Felix
> 

The comment is not yet addresses, since the patch itself passes CI and
can be merged.

What would be better for us to do - merge it "as is", wait for v2, or
include changes proposed by Felix without waiting of v2?

> >              kernel, initrd =
> > isar_get_filenames(get_bitbake_var("IMAGE_ROOTFS"))
> > +            if temp_initrd:
> > +                initrd = temp_initrd
> >  
> >              boot_conf = ""
> >              boot_conf += "title %s\n" % (title if title else
> > "boot")
> > -- 
> > 2.43.0
> > 
> 
> -- 
> Siemens AG, Technology
> Linux Expert Center
> 
>