Merge branch 'systemd' of github.com:NixOS/nixos into systemd

2012-09-28 11:41:59 -04:00 · 2012-09-28 11:41:59 -04:00 · 0c4c3fc8aa
commit 0c4c3fc8aa
parent 3ad370ae0a 03f13a4939
1 changed files with 2 additions and 2 deletions
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@ -351,10 +351,10 @@ in
        serviceConfig =
          ''
            ExecStart=\
-              ${pkgs.openssh}/sbin/sshd -h ${cfg.hostKeyPath} \
+              ${pkgs.openssh}/sbin/sshd -D -h ${cfg.hostKeyPath} \
                -f ${pkgs.writeText "sshd_config" cfg.extraConfig}
            Restart=always
-            Type=forking
+            Type=simple
            KillMode=process
            PIDFile=/run/sshd.pid
          '';