diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-11-08 04:13:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 04:13:58 +0000 |
| commit | b53e7732200c3e8872a98bb21015ccd12fd3a154 (patch) | |
| tree | f7f901d0d2121570992c506e01844f06d9d9e554 /nixos/modules/programs | |
| parent | e5e374ebcc0de99736306bc428438ea79e5fe496 (diff) | |
| parent | ce7d4e40f02cc73d25fac74587eea7860a5a5d15 (diff) | |
| download | nixlib-b53e7732200c3e8872a98bb21015ccd12fd3a154.tar nixlib-b53e7732200c3e8872a98bb21015ccd12fd3a154.tar.gz nixlib-b53e7732200c3e8872a98bb21015ccd12fd3a154.tar.bz2 nixlib-b53e7732200c3e8872a98bb21015ccd12fd3a154.tar.lz nixlib-b53e7732200c3e8872a98bb21015ccd12fd3a154.tar.xz nixlib-b53e7732200c3e8872a98bb21015ccd12fd3a154.tar.zst nixlib-b53e7732200c3e8872a98bb21015ccd12fd3a154.zip | |
Merge pull request #73004 from philandstuff/patch-1
ssh-agent: fix syntax problem from #71139
Diffstat (limited to 'nixos/modules/programs')
| -rw-r--r-- | nixos/modules/programs/ssh.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 703975fd06c9..80198990ed11 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -251,7 +251,7 @@ in ExecStart = "${cfg.package}/bin/ssh-agent " + optionalString (cfg.agentTimeout != null) ("-t ${cfg.agentTimeout} ") + - optionalString (cfg.agentPKCS11Whitelist != null) ("-P ${cfg.agentPKCS11Whitelist} ") + optionalString (cfg.agentPKCS11Whitelist != null) ("-P ${cfg.agentPKCS11Whitelist} ") + "-a %t/ssh-agent"; StandardOutput = "null"; Type = "forking"; |