From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RgnyF-0002Jv-1S for garchives@archives.gentoo.org; Sat, 31 Dec 2011 01:42:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59C8621C0ED; Sat, 31 Dec 2011 01:42:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2A1EB21C0ED for ; Sat, 31 Dec 2011 01:42:43 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A6FD31B4002 for ; Sat, 31 Dec 2011 01:42:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 12C8A80043 for ; Sat, 31 Dec 2011 01:42:42 +0000 (UTC) From: "Christian Ruppert" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christian Ruppert" Message-ID: Subject: [gentoo-commits] proj/openrc:master commit in: man/, sh/ X-VCS-Repository: proj/openrc X-VCS-Files: man/runscript.8 sh/runscript.sh.in X-VCS-Directories: man/ sh/ X-VCS-Committer: idl0r X-VCS-Committer-Name: Christian Ruppert X-VCS-Revision: fb8db18d79b4efc65c2b04a66a8e9e3b56f21f00 Date: Sat, 31 Dec 2011 01:42:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f3c1ecf7-f6e8-40ea-9647-448bb9f35be4 X-Archives-Hash: 1eb20e8a159884de09767537b08dd36f commit: fb8db18d79b4efc65c2b04a66a8e9e3b56f21f00 Author: Christian Ruppert gentoo org> AuthorDate: Sat Dec 31 01:41:59 2011 +0000 Commit: Christian Ruppert gentoo org> CommitDate: Sat Dec 31 01:41:59 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3Dfb8db18d Add "retry" option for the stop() template --- man/runscript.8 | 5 ++++- sh/runscript.sh.in | 1 + 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/man/runscript.8 b/man/runscript.8 index 9439b76..77b2399 100644 --- a/man/runscript.8 +++ b/man/runscript.8 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY = OF .\" SUCH DAMAGE. .\" -.Dd November 4, 2009 +.Dd December 31, 2011 .Dt RUNSCRIPT 8 SMM .Os OpenRC .Sh NAME @@ -112,6 +112,9 @@ List of arguments to pass to the daemon when starting= . Pidfile to use for the above defined command. .It Ar name Display name used for the above defined command. +.It Ar retry +You can either specify a timeout in seconds or a multiple signal/timeout= pairs +as a stopping schedule. This is only used during stop(). .El .Sh DEPENDENCIES You should define a diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in index b738b89..470f04c 100644 --- a/sh/runscript.sh.in +++ b/sh/runscript.sh.in @@ -151,6 +151,7 @@ stop() [ -n "$command" -o -n "$procname" -o -n "$pidfile" ] || return 0 ebegin "Stopping ${name:-$RC_SVCNAME}" start-stop-daemon --stop \ + ${retry:+--retry} $retry \ ${command:+--exec} $command \ ${procname:+--name} $procname \ ${pidfile:+--pidfile} $pidfile \