Supress ssh unit generation if sshd is not present

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index f8a0248070dc45716b8ab8620129d57159bf3047..eaf75770a80c264cf76d8cc232ce8cd509b7a91a 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -116,6 +116,7 @@ from mkosi.run import (
     chroot_options,
     finalize_interpreter,
     finalize_passwd_symlinks,
+    find_binary,
     fork_and_wait,
     run,
     spawn,
@@ -2888,9 +2889,9 @@ def configure_ssh(context: Context) -> None:
     if context.config.ssh in (Ssh.never, Ssh.runtime):
         return
 
-    if (
-        context.config.ssh == Ssh.auto
-        and (context.root / "usr/lib/systemd/system-generators/systemd-ssh-generator").exists()
+    if context.config.ssh == Ssh.auto and (
+        (context.root / "usr/lib/systemd/system-generators/systemd-ssh-generator").exists()
+        or not find_binary("sshd", root=context.root)
     ):
         # systemd-ssh-generator is installed, so we don't need to configure SSH.
         return

diff --git a/mkosi/resources/man/mkosi.1.md b/mkosi/resources/man/mkosi.1.md
index 1d1e451736ffb499294d39ee1233405cc4b5d227..5a8612210f469d08d2c1c0cda1e5874aaa5e1ce0 100644 (file)
--- a/mkosi/resources/man/mkosi.1.md
+++ b/mkosi/resources/man/mkosi.1.md
@@ -1167,16 +1167,16 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
     in the final image. Takes one of `always`, `never`, `auto` or `runtime`.
     Defaults to `auto`.
 
-    If set to `auto` and the generator binary `systemd-ssh-generator`
-    is not preset in the image, or set to `always`, mkosi will install **sshd** units
-    in the final image that expose SSH over VSock. If set to `never`,
-    mkosi will not install these units. If the `runtime` value is used,
+    If set to `auto` and `sshd` is present in the image and the generator binary
+    `systemd-ssh-generator` is not present, or if set to `always`,
+    mkosi will install **sshd** units in the final image that expose SSH over VSock.
+    If set to `never`, mkosi will not install these units. If the `runtime` value is used,
     mkosi will also not install any units but abort starting `mkosi vm` if no
     SSH credentials are configured. When building with this
     option and running the image using `mkosi vm`, the `mkosi ssh`
     command can be used to connect to the container/VM via SSH. Note that
     you still have to make sure openssh is installed in the image to make
-    this option behave correctly. Run `mkosi genkey` to automatically
+    `mkosi ssh` behave correctly. Run `mkosi genkey` to automatically
     generate an X.509 certificate and private key to be used by **mkosi** to
     enable SSH access to any virtual machines via `mkosi ssh`. To access
     images booted using `mkosi boot`, use **machinectl**.