diff mbox series

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

Message ID 20240201110346.3558643-1-Quirin.Gylstorff@siemens.com
State Accepted, archived
Headers show
Series [v2] wic/plugins/bootimg-efi-isar: Use initrd from source params | expand

Commit Message

Quirin Gylstorff Feb. 1, 2024, 11:03 a.m. UTC 
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(+)

Comments

Uladzimir Bely Feb. 6, 2024, 8:08 a.m. UTC | #1 
On Thu, 2024-02-01 at 12:03 +0100, Quirin Gylstorff 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>
> ---
> 
> Changes v2:
>  - simplify assignment

Applied to next, thanks.
diff mbox series

Patch

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