Drop upstart system and user jobs.

1 files changed, 1 insertions, 7 deletions

diff --git a/debian/agent-launch b/debian/agent-launch
index 79c75a50b..f3cbfaef8 100755
--- a/debian/agent-launch
+++ b/debian/agent-launch
@@ -1,5 +1,5 @@
 #!/bin/sh
-# helper script for launching ssh-agent, used by systemd unit and upstart job
+# helper script for launching ssh-agent, used by systemd unit
 set -e
 
 if [ ! -d "$XDG_RUNTIME_DIR" ]; then
@@ -11,17 +11,11 @@ if [ "$1" = start ]; then
     if [ -z "$SSH_AUTH_SOCK" ] && grep -s -q '^use-ssh-agent$' /etc/X11/Xsession.options; then
         S="$XDG_RUNTIME_DIR/openssh_agent"
         dbus-update-activation-environment --verbose --systemd SSH_AUTH_SOCK=$S SSH_AGENT_LAUNCHER=openssh
-        if [ "$UPSTART_SESSION" ] && type initctl >/dev/null 2>&1; then
-            initctl set-env --global SSH_AUTH_SOCK=$S
-        fi
         exec ssh-agent -D -a $S
     fi
 elif [ "$1" = stop ]; then
     if [ "$SSH_AGENT_LAUNCHER" = openssh ]; then
         dbus-update-activation-environment --systemd  SSH_AUTH_SOCK=
-        if [ "$UPSTART_SESSION" ] && type initctl >/dev/null 2>&1; then
-            initctl unset-env --global SSH_AUTH_SOCK
-        fi
     fi
 else
     echo "Unknown command $1" >&2