3 files changed, 18 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 92a41f314..67e4d81f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openssh (1:3.6.1p2-11) UNRELEASED; urgency=low
 
   * Comment out pam_limits in default configuration, for now at least
     (closes: #198254).
+  * Use invoke-rc.d (if it exists) to run the init script.
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 30 Dec 2003 13:38:02 +0000
 
diff --git a/debian/postinst b/debian/postinst
index af0f8a21c..f3d4cf6d5 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -289,7 +289,11 @@ fix_conffile_permissions() {
 setup_startup() {
         db_get ssh/run_sshd
         if [ "$RET" = "false" ] ; then
-                /etc/init.d/ssh stop 2>&1 >/dev/null
+                if [ -x /usr/sbin/invoke-rc.d ]; then
+                        invoke-rc.d --quiet ssh stop
+                else
+                        /etc/init.d/ssh stop
+                fi
                 touch /etc/ssh/sshd_not_to_be_run
         else
                 rm -f /etc/ssh/sshd_not_to_be_run 2>/dev/null
@@ -298,9 +302,13 @@ setup_startup() {
 
 
 setup_init() {
-        if [ -e /etc/init.d/ssh ]; then
+        if [ -x /etc/init.d/ssh ]; then
                 update-rc.d ssh defaults >/dev/null
-                /etc/init.d/ssh restart
+                if [ -x /usr/sbin/invoke-rc.d ]; then
+                        invoke-rc.d ssh restart
+                else
+                        /etc/init.d/ssh restart
+                fi
         fi
 }
 
diff --git a/debian/prerm b/debian/prerm
index 8ed7e07ec..5c1aa1351 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -20,8 +20,12 @@ case "$1" in
         update-alternatives --quiet --remove rsh /usr/bin/ssh
         update-alternatives --quiet --remove rlogin /usr/bin/slogin
         update-alternatives --quiet --remove rcp /usr/bin/scp
-        if [ -e /etc/init.d/ssh ]; then
-                /etc/init.d/ssh stop
+        if [ -x /etc/init.d/ssh ]; then
+                if [ -x /usr/sbin/invoke-rc.d ]; then
+                        invoke-rc.d ssh stop
+                else
+                        /etc/init.d/ssh stop
+                fi
         fi
 #       install-info --quiet --remove /usr/info/ssh-askpass.info.gz
         ;;