From 26c1dc6eec6b1de5e180f81004492ae09e071da6 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 30 Sep 2003 17:55:55 +0000 Subject: Use --retry in init script when restarting rather than sleeping, to make sure the old process is dead (thanks, Herbert Xu; closes: #212117). --- debian/changelog | 2 ++ debian/init | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') 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 * New upstream release. * Remove -fno-builtin-log and -DHAVE_MMAP_ANON_SHARED compiler options, which are no longer necessary. + * Use --retry in init script when restarting rather than sleeping, to make + sure the old process is dead (thanks, Herbert Xu; closes: #212117). -- Colin Watson Tue, 23 Sep 2003 19:22:38 +0100 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 restart) check_config echo -n "Restarting OpenBSD Secure Shell server: sshd" - start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid + start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile /var/run/sshd.pid check_for_no_start check_privsep_dir - sleep 2 start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS echo "." ;; -- cgit v1.2.3