diff options
| author | Robin Gloster <mail@glob.in> | 2016-08-05 19:58:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 19:58:06 +0200 |
| commit | f4e1041e318ef83ede7b6162b87191f25f01e534 (patch) | |
| tree | 501694dc2b28e3f0648a7fe398b6b052c1da0a43 | |
| parent | f044035a9eb83bb9b4be1c90cf9205e8723a1453 (diff) | |
| parent | c4cba0e51f9db45b3faee55e8a5ed6d63c227f92 (diff) | |
| download | nixlib-f4e1041e318ef83ede7b6162b87191f25f01e534.tar nixlib-f4e1041e318ef83ede7b6162b87191f25f01e534.tar.gz nixlib-f4e1041e318ef83ede7b6162b87191f25f01e534.tar.bz2 nixlib-f4e1041e318ef83ede7b6162b87191f25f01e534.tar.lz nixlib-f4e1041e318ef83ede7b6162b87191f25f01e534.tar.xz nixlib-f4e1041e318ef83ede7b6162b87191f25f01e534.tar.zst nixlib-f4e1041e318ef83ede7b6162b87191f25f01e534.zip | |
Merge pull request #17503 from peterhoeg/ssh
ssh module: ignore exit code when socket activated
| -rw-r--r-- | nixos/modules/services/networking/ssh/sshd.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index a464733a6a03..f900ef494abf 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -263,6 +263,7 @@ in serviceConfig = { ExecStart = + (optionalString cfg.startWhenNeeded "-") + "${cfgc.package}/bin/sshd " + (optionalString cfg.startWhenNeeded "-i ") + "-f ${pkgs.writeText "sshd_config" cfg.extraConfig}"; KillMode = "process"; |