summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/openssh-server.init2
-rw-r--r--debian/openssh-server.postinst6
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
45 * Remove ssh/new_config, only needed for direct upgrades from potato which 45 * Remove ssh/new_config, only needed for direct upgrades from potato which
46 are no longer particularly feasible anyway (closes: #420682). 46 are no longer particularly feasible anyway (closes: #420682).
47 * Cope with insserv reordering of init script links. 47 * Cope with insserv reordering of init script links.
48 * Remove init script stop link in rc1, as killprocs handles it already.
48 49
49 -- Colin Watson <cjwatson@debian.org> Thu, 12 Nov 2009 21:31:44 +0000 50 -- Colin Watson <cjwatson@debian.org> Thu, 12 Nov 2009 21:31:44 +0000
50 51
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 @@
5# Required-Start: $remote_fs $syslog 5# Required-Start: $remote_fs $syslog
6# Required-Stop: $remote_fs $syslog 6# Required-Stop: $remote_fs $syslog
7# Default-Start: 2 3 4 5 7# Default-Start: 2 3 4 5
8# Default-Stop: 1 8# Default-Stop:
9# Short-Description: OpenBSD Secure Shell server 9# Short-Description: OpenBSD Secure Shell server
10### END INIT INFO 10### END INIT INFO
11 11
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() {
407 if [ -e /etc/rc2.d/S20ssh ]; then 407 if [ -e /etc/rc2.d/S20ssh ]; then
408 update-rc.d -f ssh remove >/dev/null 2>&1 408 update-rc.d -f ssh remove >/dev/null 2>&1
409 fi 409 fi
410 rm -f /etc/rc0.d/K??ssh /etc/rc6.d/K??ssh 410 rm -f /etc/rc0.d/K??ssh /etc/rc1.d/K??ssh /etc/rc6.d/K??ssh
411} 411}
412 412
413setup_init() { 413setup_init() {
414 if [ -x /etc/init.d/ssh ]; then 414 if [ -x /etc/init.d/ssh ]; then
415 update-rc.d ssh start 16 2 3 4 5 . stop 84 1 . >/dev/null 415 update-rc.d ssh start 16 2 3 4 5 . >/dev/null
416 if [ -x /usr/sbin/invoke-rc.d ]; then 416 if [ -x /usr/sbin/invoke-rc.d ]; then
417 invoke-rc.d ssh restart 417 invoke-rc.d ssh restart
418 else 418 else
@@ -455,7 +455,7 @@ setup_sshd_user
455if dpkg --compare-versions "$2" lt 1:3.6.1p2-2; then 455if dpkg --compare-versions "$2" lt 1:3.6.1p2-2; then
456 fix_conffile_permissions 456 fix_conffile_permissions
457fi 457fi
458if dpkg --compare-versions "$2" lt 1:4.6p1-1; then 458if dpkg --compare-versions "$2" lt 1:5.2p1-1; then
459 remove_old_init_links 459 remove_old_init_links
460fi 460fi
461setup_init 461setup_init