summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rw-r--r--debian/openssh-server.if-up5
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 466a09246..c000e556b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ openssh (1:7.2p2-8) UNRELEASED; urgency=medium
11 agent in the user session. Use it in ssh-agent.user-session.upstart. 11 agent in the user session. Use it in ssh-agent.user-session.upstart.
12 * Add systemd user unit for graphical sessions that use systemd. Override 12 * Add systemd user unit for graphical sessions that use systemd. Override
13 the corresponding upstart job in that case (closes: #832445). 13 the corresponding upstart job in that case (closes: #832445).
14 * debian/openssh-server.if-up: Don't block on a finished reload of
15 openssh.service, to avoid deadlocking with restarting networking.
16 (closes: #832557, LP: #1584393)
14 17
15 -- Colin Watson <cjwatson@debian.org> Thu, 28 Jul 2016 22:04:37 +0100 18 -- Colin Watson <cjwatson@debian.org> Thu, 28 Jul 2016 22:04:37 +0100
16 19
diff --git a/debian/openssh-server.if-up b/debian/openssh-server.if-up
index dd05ea51c..915284cc6 100644
--- a/debian/openssh-server.if-up
+++ b/debian/openssh-server.if-up
@@ -34,10 +34,9 @@ fi
34# the other hand, repeated restarts of ssh make systemd unhappy 34# the other hand, repeated restarts of ssh make systemd unhappy
35# (#756547/#757822), so use reload in that case. 35# (#756547/#757822), so use reload in that case.
36if [ -d /run/systemd/system ]; then 36if [ -d /run/systemd/system ]; then
37 action=reload 37 systemctl reload --no-block ssh.service >/dev/null 2>&1 || true
38else 38else
39 action=restart 39 invoke-rc.d ssh restart >/dev/null 2>&1 || true
40fi 40fi
41invoke-rc.d ssh $action >/dev/null 2>&1 || true
42 41
43exit 0 42exit 0