Remove init script stop link in rc1, as killprocs handles it already.

3 files changed, 5 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 5866f288f..1c8ecb194 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,7 @@ openssh (1:5.2p1-1) UNRELEASED; urgency=low
   * Remove ssh/new_config, only needed for direct upgrades from potato which
     are no longer particularly feasible anyway (closes: #420682).
   * Cope with insserv reordering of init script links.
+  * Remove init script stop link in rc1, as killprocs handles it already.
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 12 Nov 2009 21:31:44 +0000
 
diff --git a/debian/openssh-server.init b/debian/openssh-server.init
index 07b517260..e8b446046 100644
--- a/debian/openssh-server.init
+++ b/debian/openssh-server.init
@@ -5,7 +5,7 @@
 # Required-Start:       $remote_fs $syslog
 # Required-Stop:        $remote_fs $syslog
 # Default-Start:        2 3 4 5
-# Default-Stop:         1
+# Default-Stop:         
 # Short-Description:    OpenBSD Secure Shell server
 ### END INIT INFO
 
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index 120377d0b..9dfc68a5a 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -407,12 +407,12 @@ remove_old_init_links() {
         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/rc6.d/K??ssh
+        rm -f /etc/rc0.d/K??ssh /etc/rc1.d/K??ssh /etc/rc6.d/K??ssh
 }
 
 setup_init() {
         if [ -x /etc/init.d/ssh ]; then
-                update-rc.d ssh start 16 2 3 4 5 . stop 84 1 . >/dev/null
+                update-rc.d ssh start 16 2 3 4 5 . >/dev/null
                 if [ -x /usr/sbin/invoke-rc.d ]; then
                         invoke-rc.d ssh restart
                 else
@@ -455,7 +455,7 @@ setup_sshd_user
 if dpkg --compare-versions "$2" lt 1:3.6.1p2-2; then
     fix_conffile_permissions
 fi
-if dpkg --compare-versions "$2" lt 1:4.6p1-1; then
+if dpkg --compare-versions "$2" lt 1:5.2p1-1; then
     remove_old_init_links
 fi
 setup_init