From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 10 Mar 2024 15:32:39 +0000 (+0100)
Subject: Rename various initrd files
X-Git-Tag: v22~21^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a34c4e45c3952bf70fa4bdd7900976d4861c600;p=thirdparty%2Fmkosi.git

Rename various initrd files

Let's use consistent naming with ".initrd" as the extension for
initrds we create.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 771e8863a..49d8cf4f2 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1612,7 +1612,7 @@ def finalize_default_initrd(
         "--acl", str(config.acl),
         *(f"--package={package}" for package in config.initrd_packages),
         *(["--package-directory", str(package_dir)] if package_dir else []),
-        "--output", f"{config.output}-initrd",
+        "--output", "initrd",
         *(["--image-id", config.image_id] if config.image_id else []),
         *(["--image-version", config.image_version] if config.image_version else []),
         *(
@@ -1657,7 +1657,7 @@ def build_default_initrd(context: Context) -> Path:
         context.args,
         context.config,
         resources=context.resources,
-        output_dir=context.workspace / "initrd",
+        output_dir=context.workspace,
         package_dir=context.packages,
     )
 
@@ -1733,7 +1733,7 @@ def build_microcode_initrd(context: Context) -> Optional[Path]:
     if not context.config.architecture.is_x86_variant():
         return None
 
-    microcode = context.workspace / "initrd-microcode.img"
+    microcode = context.workspace / "microcode.initrd"
     if microcode.exists():
         return microcode
 
@@ -1744,7 +1744,7 @@ def build_microcode_initrd(context: Context) -> Optional[Path]:
         logging.warning("/usr/lib/firmware/{amd-ucode,intel-ucode} not found, not adding microcode")
         return None
 
-    root = context.workspace / "initrd-microcode-root"
+    root = context.workspace / "microcode-root"
     destdir = root / "kernel/x86/microcode"
 
     with umask(~0o755):
@@ -1774,7 +1774,7 @@ def build_microcode_initrd(context: Context) -> Optional[Path]:
 
 
 def build_kernel_modules_initrd(context: Context, kver: str) -> Path:
-    kmods = context.workspace / f"initrd-kernel-modules-{kver}.img"
+    kmods = context.workspace / f"kernel-modules-{kver}.initrd"
     if kmods.exists():
         return kmods