From a5969634f4da94f85ffbce2ce81f760fd73c67e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 23:38:27 -0400
Subject: [PATCH] sshd: Do detach into the background

This is necessary to ensure that jobs that need to start after sshd
work properly.

This reverts 03f13a49392b90cdc54d8ff057cef76bf0379913.
---
 modules/services/networking/ssh/sshd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 83b7b5372ec..163616fdd18 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -347,10 +347,10 @@ in
 
         serviceConfig =
           { ExecStart =
-              "${pkgs.openssh}/sbin/sshd -D -h ${cfg.hostKeyPath} " +
+              "${pkgs.openssh}/sbin/sshd -h ${cfg.hostKeyPath} " +
               "-f ${pkgs.writeText "sshd_config" cfg.extraConfig}";
             Restart = "always";
-            Type = "simple";
+            Type = "forking";
             KillMode = "process";
             PIDFile = "/run/sshd.pid";
           };