diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-12 11:59:21 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-02-12 11:59:21 +0000 |
commit | ce51634cf72eb42a22ff1aba822080c24e8ddb91 (patch) | |
tree | 045f6e819da9e0fa33000ea2a6d5a65a5a90eace | |
parent | de5cb3521702a593b1abab37a9d54e93a80c40e7 (diff) |
Bump guard version for sysvinit->systemd transition to 1:6.5p1-3; we may have got it wrong before, and it's fairly harmless to repeat it.
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/openssh-server.postinst | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 6bf502848..cb6f489d7 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -8,6 +8,8 @@ openssh (1:6.5p1-3) UNRELEASED; urgency=medium | |||
8 | * Fix sysvinit->systemd transition code to cope with still-running | 8 | * Fix sysvinit->systemd transition code to cope with still-running |
9 | sysvinit jobs being considered active by systemd (thanks, Uoti Urpala | 9 | sysvinit jobs being considered active by systemd (thanks, Uoti Urpala |
10 | and Michael Biebl). | 10 | and Michael Biebl). |
11 | * Bump guard version for sysvinit->systemd transition to 1:6.5p1-3; we may | ||
12 | have got it wrong before, and it's fairly harmless to repeat it. | ||
11 | 13 | ||
12 | -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 21:36:14 +0000 | 14 | -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 21:36:14 +0000 |
13 | 15 | ||
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst index 5f5787698..60f88faf8 100644 --- a/debian/openssh-server.postinst +++ b/debian/openssh-server.postinst | |||
@@ -304,7 +304,7 @@ if [ "$action" = configure ]; then | |||
304 | # restart it under Upstart. | 304 | # restart it under Upstart. |
305 | start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid || true | 305 | start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid || true |
306 | fi | 306 | fi |
307 | if dpkg --compare-versions "$2" lt 1:6.5p1-1 && \ | 307 | if dpkg --compare-versions "$2" lt 1:6.5p1-3 && \ |
308 | [ -d /run/systemd/system ]; then | 308 | [ -d /run/systemd/system ]; then |
309 | # We must stop the sysvinit-controlled sshd before we can | 309 | # We must stop the sysvinit-controlled sshd before we can |
310 | # restart it under systemd. | 310 | # restart it under systemd. |