diff options
author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-07-25 17:03:17 +0200 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-07-29 02:32:54 +0100 |
commit | 4cebe1ac6b50c7bc74313e26d44c4fc0af8886aa (patch) | |
tree | d33233488eac0023ec3a4e5e7edd0180b53318b1 /debian/openssh-client.install | |
parent | 556ee3d2d433dc70512003667398f0979b0940a9 (diff) |
Add debian/agent-launch: Helper script for conditionally starting the SSH agent in the user session
Use it in ssh-agent.user-session.upstart. This will also be used in a
corresponding systemd user unit.
This replaces the backgrounded "ssh-agent -s" with a foreground task which
works more nicely with modern init systems for logging/debugging and
starting/stopping.
Also use a fixed socket file name in $XDG_RUNTIME_DIR -- under both upstart and
systemd we can assume this, and it allows restarting the service in a running
session.
Diffstat (limited to 'debian/openssh-client.install')
-rwxr-xr-x | debian/openssh-client.install | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/openssh-client.install b/debian/openssh-client.install index fd6819a7c..fd9c02d1b 100755 --- a/debian/openssh-client.install +++ b/debian/openssh-client.install | |||
@@ -26,6 +26,8 @@ usr/share/man/man8/ssh-pkcs11-helper.8 | |||
26 | contrib/ssh-copy-id usr/bin | 26 | contrib/ssh-copy-id usr/bin |
27 | debian/ssh-argv0 usr/bin | 27 | debian/ssh-argv0 usr/bin |
28 | 28 | ||
29 | debian/agent-launch usr/lib/openssh | ||
30 | |||
29 | # dh_apport would be neater, but at the time of writing it isn't in unstable | 31 | # dh_apport would be neater, but at the time of writing it isn't in unstable |
30 | # yet. | 32 | # yet. |
31 | debian/openssh-client.apport => usr/share/apport/package-hooks/openssh-client.py | 33 | debian/openssh-client.apport => usr/share/apport/package-hooks/openssh-client.py |