From 27e16e697626bddce174f09f0defab3821221bfd Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 27 Mar 2014 15:42:11 +0000 Subject: Don't start ssh-agent from the Upstart user session job if something like Xsession has already done so (based on work by Bruno Vasselle; LP: #1244736). --- debian/ssh-agent.user-session.upstart | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian/ssh-agent.user-session.upstart') diff --git a/debian/ssh-agent.user-session.upstart b/debian/ssh-agent.user-session.upstart index 8553e12f1..f127e221d 100644 --- a/debian/ssh-agent.user-session.upstart +++ b/debian/ssh-agent.user-session.upstart @@ -6,14 +6,18 @@ start on starting xsession-init pre-start script [ -e /etc/X11/Xsession.options ] || { stop; exit 0; } grep -q "^use-ssh-agent$" /etc/X11/Xsession.options || { stop; exit 0; } + [ -z "$SSH_AUTH_SOCK" ] || { stop; exit 0; } eval "$(ssh-agent)" >/dev/null initctl set-env --global SSH_AUTH_SOCK=$SSH_AUTH_SOCK initctl set-env --global SSH_AGENT_PID=$SSH_AGENT_PID + initctl set-env --global SSH_AGENT_LAUNCHER=upstart end script post-stop script + [ "$SSH_AGENT_LAUNCHER" = upstart ] || exit 0 kill $SSH_AGENT_PID 2>/dev/null || true initctl unset-env --global SSH_AUTH_SOCK initctl unset-env --global SSH_AGENT_PID + initctl unset-env --global SSH_AGENT_LAUNCHER end script -- cgit v1.2.3