public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssh: use bin instead of sbin folder

Browse Source 
References #11939.
This commit is contained in:
Aneesh Agrawal 2016-03-05 23:56:32 -05:00
parent 0bf8a1a86d
commit bb39304ce6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -263,7 +263,7 @@ in
serviceConfig = serviceConfig =
{ ExecStart = { ExecStart =
"${cfgc.package}/sbin/sshd " + (optionalString cfg.startWhenNeeded "-i ") + "${cfgc.package}/bin/sshd " + (optionalString cfg.startWhenNeeded "-i ") +
"-f ${pkgs.writeText "sshd_config" cfg.extraConfig}"; "-f ${pkgs.writeText "sshd_config" cfg.extraConfig}";
KillMode = "process"; KillMode = "process";
} // (if cfg.startWhenNeeded then { } // (if cfg.startWhenNeeded then {

1
pkgs/tools/networking/openssh/default.nix
View File

@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
# I set --disable-strip because later we strip anyway. And it fails to strip # I set --disable-strip because later we strip anyway. And it fails to strip
# properly when cross building. # properly when cross building.
configureFlags = [ configureFlags = [
"--sbindir=\${out}/bin"
"--localstatedir=/var" "--localstatedir=/var"
"--with-pid-dir=/run" "--with-pid-dir=/run"
"--with-mantype=man" "--with-mantype=man"