From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 12 Dec 2023 11:21:23 +0000 (+0100)
Subject: mkosi-initrd: Pass image ID to initrd build
X-Git-Tag: v20~71^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4db71bcb454d8961872e448a7f63963117a29e5;p=thirdparty%2Fmkosi.git

mkosi-initrd: Pass image ID to initrd build

Let's allow passing in an image ID and use no image ID by default.
Let's also allow overriding the output
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 83f7818dc..e24de523c 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1310,6 +1310,7 @@ def build_initrd(state: MkosiState) -> Path:
         "--acl", str(state.config.acl),
         *flatten(["--package", package] for package in state.config.initrd_packages),
         "--output", f"{state.config.output}-initrd",
+        *(["--image-id", state.config.image_id] if state.config.image_id else []),
         *(["--image-version", state.config.image_version] if state.config.image_version else []),
         *(
             ["--source-date-epoch", str(state.config.source_date_epoch)]
diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf b/mkosi/resources/mkosi-initrd/mkosi.conf
index 784813506..5dcabcf29 100644
--- a/mkosi/resources/mkosi-initrd/mkosi.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf
@@ -1,8 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Output]
-ImageId=initrd
-Output=initrd
+@Output=initrd
 @Format=cpio
 ManifestFormat=
 CompressOutput=yes