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 83f7818dc2ad6ce717d1f5425246090a7b47d8fa..e24de523c029bd15d2e2a92317dee06d714a4913 100644 (file)
--- 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 784813506dd0146db140718a52f944ec7798899b..5dcabcf29233d01aec6812d40547cdf94e6cdcad 100644 (file)
--- 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