Remove code related to non-dependency-based sysv-rc ordering, since that is no longer supported.

3 files changed, 3 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index eb335d68f..6523de8a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ openssh (1:6.5p1-4) UNRELEASED; urgency=medium
   * Amend "Running sshd from inittab" instructions in README.Debian to
     recommend 'update-rc.d ssh disable', rather than manual removal of rc*.d
     symlinks that won't work with dependency-based sysv-rc.
+  * Remove code related to non-dependency-based sysv-rc ordering, since that
+    is no longer supported.
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 13 Feb 2014 10:53:22 +0000
 
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index d4c1a4ddf..0189f5fbb 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -272,24 +272,11 @@ setup_sshd_user() {
         fi
 }
 
-remove_old_init_links() {
-        # Yes, this only works with the SysV init script layout. I know.
-        # The important thing is that it doesn't actually *break* with
-        # file-rc ...
-        if [ -e /etc/rc2.d/S20ssh ]; then
-                update-rc.d -f ssh remove >/dev/null 2>&1
-        fi
-        rm -f /etc/rc0.d/K??ssh /etc/rc1.d/K??ssh /etc/rc6.d/K??ssh
-}
-
 if [ "$action" = configure ]; then
         create_sshdconfig
         create_keys
         fix_statoverride
         setup_sshd_user
-        if dpkg --compare-versions "$2" lt 1:5.2p1-1; then
-            remove_old_init_links
-        fi
         # Renamed to /etc/ssh/moduli in 2.9.9 (!)
         if dpkg --compare-versions "$2" lt 1:4.7p1-1; then
             rm -f /etc/ssh/primes
diff --git a/debian/rules b/debian/rules
index 888921670..f57ebaa80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -200,7 +200,7 @@ override_dh_systemd_enable:
         dh_systemd_enable -popenssh-server --name ssh --no-enable ssh.socket
 
 override_dh_installinit:
-        dh_installinit -R --name ssh -- start 16 2 3 4 5 .
+        dh_installinit -R --name ssh
 
 override_dh_installpam:
         dh_installpam --name sshd