diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-01-25 10:42:31 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-01-25 10:42:31 +0100 |
| commit | ff51021920611d2f2095ef85853344db0deb0062 (patch) | |
| tree | 0ff99478376d9994a8ba2ec435595029e233a356 /nixos/modules | |
| parent | 3622038d20bb88f9a77ffe371721a9f77627e8af (diff) | |
| parent | 312bae7fc07c846d70751ff2d414db2b11c43563 (diff) | |
| download | nixlib-ff51021920611d2f2095ef85853344db0deb0062.tar nixlib-ff51021920611d2f2095ef85853344db0deb0062.tar.gz nixlib-ff51021920611d2f2095ef85853344db0deb0062.tar.bz2 nixlib-ff51021920611d2f2095ef85853344db0deb0062.tar.lz nixlib-ff51021920611d2f2095ef85853344db0deb0062.tar.xz nixlib-ff51021920611d2f2095ef85853344db0deb0062.tar.zst nixlib-ff51021920611d2f2095ef85853344db0deb0062.zip | |
Merge pull request #12590 from exi/askpass-in-env
nixos-ssh: set SSH_ASKPASS globally and not just on interactive shells
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/programs/ssh.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 260888be485f..2da8ff738fbc 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -221,10 +221,7 @@ in fi ''; - environment.interactiveShellInit = optionalString config.services.xserver.enable - '' - export SSH_ASKPASS=${askPassword} - ''; + environment.variables.SSH_ASKPASS = optionalString config.services.xserver.enable askPassword; programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; |