From: Michael Ferrari <nekkodroid404@gmail.com>
Date: Mon, 1 Jul 2024 09:14:42 +0000 (+0200)
Subject: Use long options for `systemd-dissect`
X-Git-Tag: v24~75^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2814%2Fhead;p=thirdparty%2Fmkosi.git

Use long options for `systemd-dissect`
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 6cf29d99b..82f79cabf 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -108,8 +108,8 @@ def mount_base_trees(context: Context) -> Iterator[None]:
                 extract_tar(path, d, sandbox=context.sandbox)
                 bases += [d]
             elif path.suffix == ".raw":
-                run(["systemd-dissect", "-M", path, d])
-                stack.callback(lambda: run(["systemd-dissect", "-U", d]))
+                run(["systemd-dissect", "--mount", "--mkdir", path, d])
+                stack.callback(lambda: run(["systemd-dissect", "--umount", "--rmdir", d]))
                 bases += [d]
             else:
                 die(f"Unsupported base tree source {path}")