mkosi-initrd: build using a temporary directory

Fixes systemd#3083
aafeijoo-suse · Oct 2, 2024 · 08e5f64 · 08e5f64
1 parent e6a3e23
commit 08e5f64
Showing 1 changed file with 91 additions and 83 deletions.
diff --git a/mkosi/initrd.py b/mkosi/initrd.py
@@ -11,9 +11,10 @@
 import mkosi.resources
 from mkosi.config import DocFormat, OutputFormat
 from mkosi.documentation import show_docs
-from mkosi.log import log_setup
+from mkosi.log import log_notice, log_setup
 from mkosi.run import find_binary, run, uncaught_exception_handler
 from mkosi.sandbox import __version__
+from mkosi.tree import copy_tree
 from mkosi.types import PathString
 from mkosi.util import resource_path
 
@@ -88,89 +89,96 @@ def main() -> None:
             show_docs("mkosi-initrd", DocFormat.all(), resources=r)
         return
 
-    cmdline: list[PathString] = [
-        "mkosi",
-        "--force",
-        "--directory", "",
-        "--format", args.format,
-        "--output", args.output,
-        "--output-dir", args.output_dir,
-        "--extra-tree", f"/usr/lib/modules/{args.kernel_version}:/usr/lib/modules/{args.kernel_version}",
-        "--extra-tree=/usr/lib/firmware:/usr/lib/firmware",
-        "--remove-files=/usr/lib/firmware/*-ucode",
-        "--kernel-modules-exclude=.*",
-        "--kernel-modules-include=host",
-        "--build-sources", "",
-        "--include=mkosi-initrd",
-    ]  # fmt: skip
-
-    if args.debug:
-        cmdline += ["--debug"]
-    if args.debug_shell:
-        cmdline += ["--debug-shell"]
-
-    if os.getuid() == 0:
-        cmdline += [
-            "--workspace-dir=/var/tmp",
-            "--package-cache-dir=/var",
-            "--cache-only=metadata",
-        ]
-        if args.format != OutputFormat.directory.value:
-            cmdline += ["--output-mode=600"]
-
-    for d in (
-        "/usr/lib/mkosi-initrd",
-        "/usr/local/lib/mkosi-initrd",
-        "/run/mkosi-initrd",
-        "/etc/mkosi-initrd",
-    ):
-        if Path(d).exists():
-            cmdline += ["--include", d]
-
-    with tempfile.TemporaryDirectory() as d:
-        # Make sure we don't use any of mkosi's default repositories.
-        for p in (
-            "yum.repos.d/mkosi.repo",
-            "apt/sources.list.d/mkosi.sources",
-            "zypp/repos.d/mkosi.repo",
-            "pacman.conf",
+    with tempfile.TemporaryDirectory() as staging_dir:
+        cmdline: list[PathString] = [
+            "mkosi",
+            "--force",
+            "--directory", "",
+            "--format", args.format,
+            "--output", args.output,
+            "--output-dir", staging_dir,
+            "--extra-tree", f"/usr/lib/modules/{args.kernel_version}:/usr/lib/modules/{args.kernel_version}",
+            "--extra-tree=/usr/lib/firmware:/usr/lib/firmware",
+            "--remove-files=/usr/lib/firmware/*-ucode",
+            "--kernel-modules-exclude=.*",
+            "--kernel-modules-include=host",
+            "--build-sources", "",
+            "--include=mkosi-initrd",
+        ]  # fmt: skip
+
+        if args.debug:
+            cmdline += ["--debug"]
+        if args.debug_shell:
+            cmdline += ["--debug-shell"]
+
+        if os.getuid() == 0:
+            cmdline += [
+                "--workspace-dir=/var/tmp",
+                "--package-cache-dir=/var",
+                "--cache-only=metadata",
+            ]
+            if args.format != OutputFormat.directory.value:
+                cmdline += ["--output-mode=600"]
+
+        for d in (
+            "/usr/lib/mkosi-initrd",
+            "/usr/local/lib/mkosi-initrd",
+            "/run/mkosi-initrd",
+            "/etc/mkosi-initrd",
         ):
-            (Path(d) / "etc" / p).parent.mkdir(parents=True, exist_ok=True)
-            (Path(d) / "etc" / p).touch()
-
-        # Copy in the host's package manager configuration.
-        for p in (
-            "dnf",
-            "yum.repos.d/",
-            "apt",
-            "zypp",
-            "pacman.conf",
-            "pacman.d/",
-        ):
-            if not (Path("/etc") / p).exists():
-                continue
-
-            (Path(d) / "etc" / p).parent.mkdir(parents=True, exist_ok=True)
-            if (Path("/etc") / p).resolve().is_file():
-                shutil.copy2(Path("/etc") / p, Path(d) / "etc" / p)
-            else:
-                shutil.copytree(
-                    Path("/etc") / p,
-                    Path(d) / "etc" / p,
-                    ignore=shutil.ignore_patterns("gnupg"),
-                    dirs_exist_ok=True,
-                )
-
-        cmdline += ["--sandbox-tree", d]
-
-        # Prefer dnf as dnf5 has not yet officially replaced it and there's a much bigger chance that there
-        # will be a populated dnf cache directory.
-        run(
-            cmdline,
-            stdin=sys.stdin,
-            stdout=sys.stdout,
-            env={"MKOSI_DNF": dnf.name} if (dnf := find_binary("dnf", "dnf5")) else {},
-        )
+            if Path(d).exists():
+                cmdline += ["--include", d]
+
+        with tempfile.TemporaryDirectory() as d:
+            # Make sure we don't use any of mkosi's default repositories.
+            for p in (
+                "yum.repos.d/mkosi.repo",
+                "apt/sources.list.d/mkosi.sources",
+                "zypp/repos.d/mkosi.repo",
+                "pacman.conf",
+            ):
+                (Path(d) / "etc" / p).parent.mkdir(parents=True, exist_ok=True)
+                (Path(d) / "etc" / p).touch()
+
+            # Copy in the host's package manager configuration.
+            for p in (
+                "dnf",
+                "yum.repos.d/",
+                "apt",
+                "zypp",
+                "pacman.conf",
+                "pacman.d/",
+            ):
+                if not (Path("/etc") / p).exists():
+                    continue
+
+                (Path(d) / "etc" / p).parent.mkdir(parents=True, exist_ok=True)
+                if (Path("/etc") / p).resolve().is_file():
+                    shutil.copy2(Path("/etc") / p, Path(d) / "etc" / p)
+                else:
+                    shutil.copytree(
+                        Path("/etc") / p,
+                        Path(d) / "etc" / p,
+                        ignore=shutil.ignore_patterns("gnupg"),
+                        dirs_exist_ok=True,
+                    )
+
+            cmdline += ["--sandbox-tree", d]
+
+            # Prefer dnf as dnf5 has not yet officially replaced it and there's a much bigger chance that
+            # there will be a populated dnf cache directory.
+            run(
+                cmdline,
+                stdin=sys.stdin,
+                stdout=sys.stdout,
+                env={"MKOSI_DNF": dnf.name} if (dnf := find_binary("dnf", "dnf5")) else {},
+            )
+
+            if not args.output_dir:
+                args.output_dir = Path().resolve()
+
+            log_notice(f"Copying {staging_dir}/{args.output} to {args.output_dir}")
+            copy_tree(Path(staging_dir), Path(args.output_dir))
 
 
 if __name__ == "__main__":