summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/openssh-server.if-up12
2 files changed, 16 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 92c15dda8..e041fc8d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1openssh (1:6.6p1-8) UNRELEASED; urgency=medium
2
3 * Make the if-up hook use "reload" rather than "restart" if the system was
4 booted using systemd (closes: #756547).
5
6 -- Colin Watson <cjwatson@debian.org> Wed, 13 Aug 2014 00:59:23 +0100
7
1openssh (1:6.6p1-7) unstable; urgency=medium 8openssh (1:6.6p1-7) unstable; urgency=medium
2 9
3 * Make sure that DEB_HOST_ARCH is set, even when invoking debian/rules 10 * Make sure that DEB_HOST_ARCH is set, even when invoking debian/rules
diff --git a/debian/openssh-server.if-up b/debian/openssh-server.if-up
index de92866e6..dd05ea51c 100644
--- a/debian/openssh-server.if-up
+++ b/debian/openssh-server.if-up
@@ -30,8 +30,14 @@ if [ ! -f /var/run/sshd.pid ] || \
30 exit 0 30 exit 0
31fi 31fi
32 32
33# We'd like to use 'reload' here, but it has some problems; see 33# We'd like to use 'reload' here, but it has some problems; see #502444. On
34# #502444. 34# the other hand, repeated restarts of ssh make systemd unhappy
35invoke-rc.d ssh restart >/dev/null 2>&1 || true 35# (#756547/#757822), so use reload in that case.
36if [ -d /run/systemd/system ]; then
37 action=reload
38else
39 action=restart
40fi
41invoke-rc.d ssh $action >/dev/null 2>&1 || true
36 42
37exit 0 43exit 0