From ce51634cf72eb42a22ff1aba822080c24e8ddb91 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 12 Feb 2014 11:59:21 +0000 Subject: 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. --- debian/changelog | 2 ++ debian/openssh-server.postinst | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 * Fix sysvinit->systemd transition code to cope with still-running sysvinit jobs being considered active by systemd (thanks, Uoti Urpala and Michael Biebl). + * 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. -- Colin Watson Tue, 11 Feb 2014 21:36:14 +0000 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 # restart it under Upstart. start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid || true fi - if dpkg --compare-versions "$2" lt 1:6.5p1-1 && \ + if dpkg --compare-versions "$2" lt 1:6.5p1-3 && \ [ -d /run/systemd/system ]; then # We must stop the sysvinit-controlled sshd before we can # restart it under systemd. -- cgit v1.2.3