From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 4 Jan 2024 12:26:06 +0000 (+0100)
Subject: Use recognizable tag names for RuntimeTrees= mounts
X-Git-Tag: v20~12^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02f84e32cc14dc4a01aa2f446322f6211bd015e7;p=thirdparty%2Fmkosi.git

Use recognizable tag names for RuntimeTrees= mounts

This makes it easier to do the mount manually in images with systemd
older than v254.
---

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 0d80d7687..05b67bec7 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -709,12 +709,13 @@ def run_qemu(args: Args, config: Config, qemu_device_fds: Mapping[QemuDeviceNode
 
         for tree in config.runtime_trees:
             sock = stack.enter_context(start_virtiofsd(tree.source, uidmap=True))
+            tag = tree.target.name if tree.target else tree.source.name
             cmdline += [
                 "-chardev", f"socket,id={sock.name},path={sock}",
-                "-device", f"vhost-user-fs-pci,queue-size=1024,chardev={sock.name},tag={sock.name}",
+                "-device", f"vhost-user-fs-pci,queue-size=1024,chardev={sock.name},tag={tag}",
             ]
             target = Path("/root/src") / (tree.target or tree.source.name)
-            kcl += [f"systemd.mount-extra={sock.name}:{target}:virtiofs"]
+            kcl += [f"systemd.mount-extra={tag}:{target}:virtiofs"]
 
         if want_scratch(config) or config.output_format in (OutputFormat.disk, OutputFormat.esp):
             cmdline += ["-device", "virtio-scsi-pci,id=scsi"]