public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Quirin Gylstorff <Quirin.Gylstorff@siemens.com>
To: felix.moessbauer@siemens.com, ubely@ilbers.de,
	isar-users@googlegroups.com
Subject: [PATCH v2] wic/plugins/bootimg-efi-isar: Use initrd from source params
Date: Thu,  1 Feb 2024 12:03:21 +0100	[thread overview]
Message-ID: <20240201110346.3558643-1-Quirin.Gylstorff@siemens.com> (raw)

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>
---

Changes v2:
 - simplify assignment

 meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 3 +++
 1 file changed, 3 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..4bfb70a0 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,10 @@ class BootimgEFIPlugin(SourcePlugin):
 
             title = source_params.get('title')
 
+            temp_initrd = initrd
             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


             reply	other threads:[~2024-02-01 11:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-01 11:03 Quirin Gylstorff [this message]
2024-02-06  8:08 ` Uladzimir Bely

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240201110346.3558643-1-Quirin.Gylstorff@siemens.com \
    --to=quirin.gylstorff@siemens.com \
    --cc=felix.moessbauer@siemens.com \
    --cc=isar-users@googlegroups.com \
    --cc=ubely@ilbers.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox