From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 30 Jan 2024 21:05:34 +0000 (+0100)
Subject: Introduce want_initrd()
X-Git-Tag: v21~77^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73d6e2ed2bfb3ee3687353a28a7fb36fcff51718;p=thirdparty%2Fmkosi.git

Introduce want_initrd()
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 75eca8fb9..824f7195b 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1457,6 +1457,19 @@ def gen_kernel_images(context: Context) -> Iterator[tuple[str, Path]]:
                 break
 
 
+def want_initrd(context: Context) -> bool:
+    if context.config.bootable == ConfigFeature.disabled:
+        return False
+
+    if context.config.output_format not in (OutputFormat.disk, OutputFormat.directory):
+        return False
+
+    if not any(gen_kernel_images(context)):
+        return False
+
+    return True
+
+
 def build_initrd(context: Context) -> Path:
     if context.config.distribution == Distribution.custom:
         die("Building a default initrd is not supported for custom distributions")
@@ -2012,13 +2025,7 @@ def copy_nspawn_settings(context: Context) -> None:
 
 
 def copy_initrd(context: Context) -> None:
-    if (context.staging / context.config.output_split_initrd).exists():
-        return
-
-    if context.config.bootable == ConfigFeature.disabled:
-        return
-
-    if context.config.output_format not in (OutputFormat.disk, OutputFormat.directory):
+    if not want_initrd(context):
         return
 
     for kver, _ in gen_kernel_images(context):