From bbe66636f4dee107b6e710eefca4b4dd3f691ef4 Mon Sep 17 00:00:00 2001
From: gwitmond <guido@witmond.nl>
Date: Thu, 1 Jul 2021 00:43:54 +0200
Subject: [PATCH] nixos/sshd: add -D flag to prevent forking into a separate
 process (#122844)

It makes it easier for init-processes to monitor correct startup and liveness.
---
 nixos/modules/services/networking/ssh/sshd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 91caa2ccb422..2c96b94ca43c 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -453,6 +453,7 @@ in
               { ExecStart =
                   (optionalString cfg.startWhenNeeded "-") +
                   "${cfgc.package}/bin/sshd " + (optionalString cfg.startWhenNeeded "-i ") +
+                  "-D " +  # don't detach into a daemon process
                   "-f /etc/ssh/sshd_config";
                 KillMode = "process";
               } // (if cfg.startWhenNeeded then {