Reorder transition code by guard version.

1 files changed, 6 insertions, 6 deletions

diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index 60f88faf8..d4c1a4ddf 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -304,12 +304,6 @@ 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-3 && \
-           [ -d /run/systemd/system ]; then
-            # We must stop the sysvinit-controlled sshd before we can
-            # restart it under systemd.
-            start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd || true
-        fi
         if dpkg --compare-versions "$2" lt 1:6.5p1-2 && \
            deb-systemd-helper debian-installed ssh.socket && \
            deb-systemd-helper --quiet was-enabled ssh.service && \
@@ -318,6 +312,12 @@ if [ "$action" = configure ]; then
             # enabled.
             deb-systemd-helper disable ssh.socket >/dev/null || true
         fi
+        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.
+            start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd || true
+        fi
 fi
 
 #DEBHELPER#