2 files changed, 4 insertions, 2 deletions

diff --git a/debian/agent-launch b/debian/agent-launch
index 40479b868..79c75a50b 100755
--- a/debian/agent-launch
+++ b/debian/agent-launch
@@ -11,7 +11,7 @@ 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 type initctl >/dev/null 2>&1; then
+        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
@@ -19,7 +19,7 @@ if [ "$1" = start ]; then
 elif [ "$1" = stop ]; then
     if [ "$SSH_AGENT_LAUNCHER" = openssh ]; then
         dbus-update-activation-environment --systemd  SSH_AUTH_SOCK=
-        if type initctl >/dev/null 2>&1; then
+        if [ "$UPSTART_SESSION" ] && type initctl >/dev/null 2>&1; then
             initctl unset-env --global SSH_AUTH_SOCK
         fi
     fi
diff --git a/debian/changelog b/debian/changelog
index ae5b84e09..5dcf4438e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openssh (1:7.5p1-4) UNRELEASED; urgency=medium
 
   * Drop README.Debian section on privilege separation, as it's no longer
     optional.
+  * Only call "initctl set-env" from agent-launch if $UPSTART_SESSION is set
+    (LP: #1689299).
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 03 May 2017 12:23:16 +0100