Force ssh-agent Upstart job to use sh syntax regardless of the user's shell (thanks, Steffen Stempel; LP: #1312928).

2 files changed, 8 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 97985ce17..404bfde59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:6.6p1-5) UNRELEASED; urgency=medium
+
+  * Force ssh-agent Upstart job to use sh syntax regardless of the user's
+    shell (thanks, Steffen Stempel; LP: #1312928).
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 28 Apr 2014 15:53:15 +0100
+
 openssh (1:6.6p1-4) unstable; urgency=medium
 
   * Debconf translations:
diff --git a/debian/ssh-agent.user-session.upstart b/debian/ssh-agent.user-session.upstart
index f127e221d..385a9ecc6 100644
--- a/debian/ssh-agent.user-session.upstart
+++ b/debian/ssh-agent.user-session.upstart
@@ -8,7 +8,7 @@ pre-start script
     grep -q "^use-ssh-agent$" /etc/X11/Xsession.options || { stop; exit 0; }
     [ -z "$SSH_AUTH_SOCK" ] || { stop; exit 0; }
 
-    eval "$(ssh-agent)" >/dev/null
+    eval "$(ssh-agent -s)" >/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