diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/ssh-agent.user-session.upstart | 2 |
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 @@ | |||
1 | openssh (1:6.6p1-5) UNRELEASED; urgency=medium | ||
2 | |||
3 | * Force ssh-agent Upstart job to use sh syntax regardless of the user's | ||
4 | shell (thanks, Steffen Stempel; LP: #1312928). | ||
5 | |||
6 | -- Colin Watson <cjwatson@debian.org> Mon, 28 Apr 2014 15:53:15 +0100 | ||
7 | |||
1 | openssh (1:6.6p1-4) unstable; urgency=medium | 8 | openssh (1:6.6p1-4) unstable; urgency=medium |
2 | 9 | ||
3 | * Debconf translations: | 10 | * 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 | |||
8 | grep -q "^use-ssh-agent$" /etc/X11/Xsession.options || { stop; exit 0; } | 8 | grep -q "^use-ssh-agent$" /etc/X11/Xsession.options || { stop; exit 0; } |
9 | [ -z "$SSH_AUTH_SOCK" ] || { stop; exit 0; } | 9 | [ -z "$SSH_AUTH_SOCK" ] || { stop; exit 0; } |
10 | 10 | ||
11 | eval "$(ssh-agent)" >/dev/null | 11 | eval "$(ssh-agent -s)" >/dev/null |
12 | initctl set-env --global SSH_AUTH_SOCK=$SSH_AUTH_SOCK | 12 | initctl set-env --global SSH_AUTH_SOCK=$SSH_AUTH_SOCK |
13 | initctl set-env --global SSH_AGENT_PID=$SSH_AGENT_PID | 13 | initctl set-env --global SSH_AGENT_PID=$SSH_AGENT_PID |
14 | initctl set-env --global SSH_AGENT_LAUNCHER=upstart | 14 | initctl set-env --global SSH_AGENT_LAUNCHER=upstart |