summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/init3
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 2dc8d3b23..06fea7b77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ openssh (1:3.7.1p2-1) UNRELEASED; urgency=low
3 * New upstream release. 3 * New upstream release.
4 * Remove -fno-builtin-log and -DHAVE_MMAP_ANON_SHARED compiler options, 4 * Remove -fno-builtin-log and -DHAVE_MMAP_ANON_SHARED compiler options,
5 which are no longer necessary. 5 which are no longer necessary.
6 * Use --retry in init script when restarting rather than sleeping, to make
7 sure the old process is dead (thanks, Herbert Xu; closes: #212117).
6 8
7 -- Colin Watson <cjwatson@debian.org> Tue, 23 Sep 2003 19:22:38 +0100 9 -- Colin Watson <cjwatson@debian.org> Tue, 23 Sep 2003 19:22:38 +0100
8 10
diff --git a/debian/init b/debian/init
index 641b9eff5..552330422 100644
--- a/debian/init
+++ b/debian/init
@@ -59,10 +59,9 @@ case "$1" in
59 restart) 59 restart)
60 check_config 60 check_config
61 echo -n "Restarting OpenBSD Secure Shell server: sshd" 61 echo -n "Restarting OpenBSD Secure Shell server: sshd"
62 start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid 62 start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile /var/run/sshd.pid
63 check_for_no_start 63 check_for_no_start
64 check_privsep_dir 64 check_privsep_dir
65 sleep 2
66 start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS 65 start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS
67 echo "." 66 echo "."
68 ;; 67 ;;