From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 9 May 2023 09:23:13 +0000 (+0200)
Subject: Make sure the initrd outputs are prefixed with the image name
X-Git-Tag: v15~174^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1548%2Fhead;p=thirdparty%2Fmkosi.git

Make sure the initrd outputs are prefixed with the image name

This makes sure that they're cleaned up in unlink_output() together with the image.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 643da964b..dffbc3702 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -771,7 +771,8 @@ def install_unified_kernel(state: MkosiState, roothash: Optional[str]) -> None:
                 "--package", "systemd",
                 "--package", "udev",
                 "--package", "kmod",
-                "--output", "initrd",
+                "--output", f"{state.config.output}-initrd",
+                *(["--image-version", state.config.image_version] if state.config.image_version else []),
                 "--make-initrd", "yes",
                 "--bootable", "no",
                 "--manifest-format", "",