From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D9DB4138330 for ; Thu, 31 May 2018 21:54:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0115CE08F7; Thu, 31 May 2018 21:54:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C3EF9E08F7 for ; Thu, 31 May 2018 21:54:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1094B335C2C for ; Thu, 31 May 2018 21:54:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A81C1287 for ; Thu, 31 May 2018 21:54:24 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1527696670.6edf516a1fe0ad4f4e8738f9fdd1bf0bc7718361.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: sh/, man/ X-VCS-Repository: proj/openrc X-VCS-Files: man/openrc-run.8 sh/supervise-daemon.sh X-VCS-Directories: man/ sh/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 6edf516a1fe0ad4f4e8738f9fdd1bf0bc7718361 X-VCS-Branch: master Date: Thu, 31 May 2018 21:54:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c2a5f70f-6d03-4433-93dd-192b8d3ca031 X-Archives-Hash: cd7c3354b943b2c2712e830fe45ea8e8 commit: 6edf516a1fe0ad4f4e8738f9fdd1bf0bc7718361 Author: Austin English gmail com> AuthorDate: Wed May 30 16:11:10 2018 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed May 30 16:11:10 2018 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=6edf516a sh/supervise-daemon.sh: use start_stop_daemon_args if supervise_daemon_args is undefined man/openrc-run.8 | 3 +++ sh/supervise-daemon.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/man/openrc-run.8 b/man/openrc-run.8 index f9109ef3..f0750406 100644 --- a/man/openrc-run.8 +++ b/man/openrc-run.8 @@ -119,6 +119,9 @@ The amount of time, in milliseconds, s6-svc should wait for the service to go down when stopping the service. The default is 60000. .It Ar start_stop_daemon_args List of arguments passed to start-stop-daemon when starting the daemon. +.It Ar supervise_daemon_args +List of arguments passed to supervise-daemon when starting the daemon. +If undefined, start_stop_daemon_args is used as a fallback. .It Ar command Daemon to start or stop via .Nm start-stop-daemon diff --git a/sh/supervise-daemon.sh b/sh/supervise-daemon.sh index b600b9c6..80e0260c 100644 --- a/sh/supervise-daemon.sh +++ b/sh/supervise-daemon.sh @@ -34,7 +34,7 @@ supervise_start() ${respawn_period:+--respawn-period} $respawn_period \ ${command_user+--user} $command_user \ ${umask+--umask} $umask \ - $supervise_daemon_args \ + ${supervise_daemon_args:-${start_stop_daemon_args}} \ $command \ -- $command_args $command_args_foreground rc=$?