diff options
| author | Aneesh Agrawal <aneeshusa@gmail.com> | 2016-03-05 23:56:32 -0500 |
|---|---|---|
| committer | Aneesh Agrawal <aneeshusa@gmail.com> | 2016-03-05 23:56:32 -0500 |
| commit | bb39304ce6169ca0c7f421f15cb1b0c378999b7e (patch) | |
| tree | 089d9f1bdd853829b84040ec510f1f0a7f488c2a | |
| parent | 0bf8a1a86df67649893726d50761567121330006 (diff) | |
| download | nixlib-bb39304ce6169ca0c7f421f15cb1b0c378999b7e.tar nixlib-bb39304ce6169ca0c7f421f15cb1b0c378999b7e.tar.gz nixlib-bb39304ce6169ca0c7f421f15cb1b0c378999b7e.tar.bz2 nixlib-bb39304ce6169ca0c7f421f15cb1b0c378999b7e.tar.lz nixlib-bb39304ce6169ca0c7f421f15cb1b0c378999b7e.tar.xz nixlib-bb39304ce6169ca0c7f421f15cb1b0c378999b7e.tar.zst nixlib-bb39304ce6169ca0c7f421f15cb1b0c378999b7e.zip | |
openssh: use bin instead of sbin folder
References #11939.
| -rw-r--r-- | nixos/modules/services/networking/ssh/sshd.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 20a1777f3ccb..5971a5a250d3 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -263,7 +263,7 @@ in serviceConfig = { ExecStart = - "${cfgc.package}/sbin/sshd " + (optionalString cfg.startWhenNeeded "-i ") + + "${cfgc.package}/bin/sshd " + (optionalString cfg.startWhenNeeded "-i ") + "-f ${pkgs.writeText "sshd_config" cfg.extraConfig}"; KillMode = "process"; } // (if cfg.startWhenNeeded then { diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 4d3ffb1257f9..f2a7642ea554 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { # I set --disable-strip because later we strip anyway. And it fails to strip # properly when cross building. configureFlags = [ + "--sbindir=\${out}/bin" "--localstatedir=/var" "--with-pid-dir=/run" "--with-mantype=man" |