From: Martin Hundebøll <martin@geanix.com>
Date: Thu, 6 Feb 2025 10:33:49 +0000 (+0100)
Subject: vmspawn: ignore failure from sshd-vsock@ unit
X-Git-Tag: v258-rc1~1407
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df8bd4c171bf88feef0302a0d0476e22e5594c82;p=thirdparty%2Fsystemd.git

vmspawn: ignore failure from sshd-vsock@ unit

The "main" sshd@.service unit ignores the return code from per-session
instances, so do the same for the vsock variant.
---

diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index 845c06dea2b..7e1310fa4f5 100644
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -2053,7 +2053,7 @@ static int run_virtual_machine(int kvm_device_fd, int vhost_device_fd) {
                                 "systemd.unit-dropin.sshd-vsock@.service:"
                                 "[Service]\n"
                                 "ExecStart=\n"
-                                "ExecStart=sshd -i -o 'AuthorizedKeysFile=%d/ssh.ephemeral-authorized_keys-all .ssh/authorized_keys'\n"
+                                "ExecStart=-sshd -i -o 'AuthorizedKeysFile=%d/ssh.ephemeral-authorized_keys-all .ssh/authorized_keys'\n"
                                 "ImportCredential=ssh.ephemeral-authorized_keys-all\n");
                 if (r < 0)
                         return log_error_errno(r, "Failed to set credential systemd.unit-dropin.sshd-vsock@.service: %m");