summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/openssh-server.if-up6
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index becfc000a..7301619a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ openssh (1:5.1p1-6) UNRELEASED; urgency=low
13 * Build with -fPIC on mips/mipsel (thanks, Luk Claes; closes: #531942). 13 * Build with -fPIC on mips/mipsel (thanks, Luk Claes; closes: #531942).
14 * Remove /var/run/sshd from openssh-server package; it will be created at 14 * Remove /var/run/sshd from openssh-server package; it will be created at
15 run-time before starting the server. 15 run-time before starting the server.
16 * Use invoke-rc.d in openssh-server's if-up script.
16 17
17 -- Colin Watson <cjwatson@debian.org> Wed, 14 Jan 2009 11:30:07 +0000 18 -- Colin Watson <cjwatson@debian.org> Wed, 14 Jan 2009 11:30:07 +0000
18 19
diff --git a/debian/openssh-server.if-up b/debian/openssh-server.if-up
index 3b3120c66..848535275 100644
--- a/debian/openssh-server.if-up
+++ b/debian/openssh-server.if-up
@@ -31,6 +31,10 @@ if [ ! -f /var/run/sshd.pid ] || \
31fi 31fi
32 32
33# We'd like to use 'reload' here, but it has some problems; see #502444. 33# We'd like to use 'reload' here, but it has some problems; see #502444.
34/etc/init.d/ssh restart >/dev/null 2>&1 || true 34if [ -x /usr/sbin/invoke-rc.d ]; then
35 invoke-rc.d ssh restart >/dev/null 2>&1 || true
36else
37 /etc/init.d/ssh restart >/dev/null 2>&1 || true
38fi
35 39
36exit 0 40exit 0