From a4d3beb36250111e9b1e5991e8b79a794022c8f0 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Wed, 13 Jun 2007 16:30:32 +0000
Subject: * Add try-restart action to init script.

---
 debian/changelog           |  1 +
 debian/openssh-server.init | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 677d4d7da..7a9dcc970 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ openssh (1:4.6p1-2) UNRELEASED; urgency=low
     terminal" message at loglevels QUIET and SILENT (closes: #366814).
   * Document the SILENT loglevel in sftp-server(8), ssh_config(5), and
     sshd_config(5).
+  * Add try-restart action to init script.
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 13 Jun 2007 00:56:45 +0100
 
diff --git a/debian/openssh-server.init b/debian/openssh-server.init
index ff6c078ad..59f45edd0 100644
--- a/debian/openssh-server.init
+++ b/debian/openssh-server.init
@@ -114,8 +114,40 @@ case "$1" in
 	fi
 	;;
 
+  try-restart)
+	check_privsep_dir
+	check_config
+	log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd"
+	set +e
+	start-stop-daemon --stop --quiet --retry 30 --pidfile /var/run/sshd.pid
+	RET="$?"
+	set -e
+	case $RET in
+	    0)
+		# old daemon stopped
+		check_for_no_start log_end_msg
+		check_dev_null log_end_msg
+		if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
+		    log_end_msg 0
+		else
+		    log_end_msg 1
+		fi
+		;;
+	    1)
+		# daemon not running
+		log_progress_msg "(not running)"
+		log_end_msg 0
+		;;
+	    *)
+		# failed to stop
+		log_progress_msg "(failed to stop)"
+		log_end_msg 1
+		;;
+	esac
+	;;
+
   *)
-	log_action_msg "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart}"
+	log_action_msg "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart|try-restart}"
 	exit 1
 esac
 
-- 
cgit v1.2.3