From: Luca Boccassi <bluca@debian.org>
Date: Mon, 29 Aug 2022 22:06:07 +0000 (+0100)
Subject: nspawn: use --link-journal=no
X-Git-Tag: v14~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3dc970de11c40ac3080141156be26aaa1ae6a5b;p=thirdparty%2Fmkosi.git

nspawn: use --link-journal=no

The host might not have a journal.

On a minimal qemu build image on OBS, building SUSE Tumbleweed,
linking the journal fails with:

  Failed to retrieve machine ID: No medium found
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index d113243a6..80adaa8eb 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -7307,6 +7307,7 @@ def run_build_script(args: MkosiArgs, root: Path, raw: Optional[BinaryIO]) -> No
             f"--uuid={args.machine_id}",
             f"--machine=mkosi-{uuid.uuid4().hex}",
             "--as-pid2",
+            "--link-journal=no",
             "--register=no",
             f"--bind={install_dir(args, root)}:/root/dest",
             f"--bind={var_tmp(root)}:/var/tmp",
diff --git a/mkosi/backend.py b/mkosi/backend.py
index 9b0fa8cd3..b318ee591 100644
--- a/mkosi/backend.py
+++ b/mkosi/backend.py
@@ -686,6 +686,7 @@ def run_workspace_command(
         "--uuid=" + args.machine_id,
         "--machine=mkosi-" + uuid.uuid4().hex,
         "--as-pid2",
+        "--link-journal=no",
         "--register=no",
         f"--bind={var_tmp(root)}:/var/tmp",
         "--setenv=SYSTEMD_OFFLINE=1",