From 09ce0380e2a396617147b1274012c097ce2e407d Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 26 Jul 2016 22:11:09 +0200 Subject: debian/openssh-server.if-up: Don't block on a finished reload of openssh.service This avoids deadlocking with restarting networking. LP: #1584393 --- debian/changelog | 3 +++ debian/openssh-server.if-up | 5 ++--- 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 agent in the user session. Use it in ssh-agent.user-session.upstart. * Add systemd user unit for graphical sessions that use systemd. Override the corresponding upstart job in that case (closes: #832445). + * debian/openssh-server.if-up: Don't block on a finished reload of + openssh.service, to avoid deadlocking with restarting networking. + (closes: #832557, LP: #1584393) -- Colin Watson Thu, 28 Jul 2016 22:04:37 +0100 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 # the other hand, repeated restarts of ssh make systemd unhappy # (#756547/#757822), so use reload in that case. if [ -d /run/systemd/system ]; then - action=reload + systemctl reload --no-block ssh.service >/dev/null 2>&1 || true else - action=restart + invoke-rc.d ssh restart >/dev/null 2>&1 || true fi -invoke-rc.d ssh $action >/dev/null 2>&1 || true exit 0 -- cgit v1.2.3