| 1 |
commit: 6edf516a1fe0ad4f4e8738f9fdd1bf0bc7718361 |
| 2 |
Author: Austin English <austinenglish <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed May 30 16:11:10 2018 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 30 16:11:10 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=6edf516a |
| 7 |
|
| 8 |
sh/supervise-daemon.sh: use start_stop_daemon_args if supervise_daemon_args is undefined |
| 9 |
|
| 10 |
man/openrc-run.8 | 3 +++ |
| 11 |
sh/supervise-daemon.sh | 2 +- |
| 12 |
2 files changed, 4 insertions(+), 1 deletion(-) |
| 13 |
|
| 14 |
diff --git a/man/openrc-run.8 b/man/openrc-run.8 |
| 15 |
index f9109ef3..f0750406 100644 |
| 16 |
--- a/man/openrc-run.8 |
| 17 |
+++ b/man/openrc-run.8 |
| 18 |
@@ -119,6 +119,9 @@ The amount of time, in milliseconds, s6-svc should wait for the service |
| 19 |
to go down when stopping the service. The default is 60000. |
| 20 |
.It Ar start_stop_daemon_args |
| 21 |
List of arguments passed to start-stop-daemon when starting the daemon. |
| 22 |
+.It Ar supervise_daemon_args |
| 23 |
+List of arguments passed to supervise-daemon when starting the daemon. |
| 24 |
+If undefined, start_stop_daemon_args is used as a fallback. |
| 25 |
.It Ar command |
| 26 |
Daemon to start or stop via |
| 27 |
.Nm start-stop-daemon |
| 28 |
|
| 29 |
diff --git a/sh/supervise-daemon.sh b/sh/supervise-daemon.sh |
| 30 |
index b600b9c6..80e0260c 100644 |
| 31 |
--- a/sh/supervise-daemon.sh |
| 32 |
+++ b/sh/supervise-daemon.sh |
| 33 |
@@ -34,7 +34,7 @@ supervise_start() |
| 34 |
${respawn_period:+--respawn-period} $respawn_period \ |
| 35 |
${command_user+--user} $command_user \ |
| 36 |
${umask+--umask} $umask \ |
| 37 |
- $supervise_daemon_args \ |
| 38 |
+ ${supervise_daemon_args:-${start_stop_daemon_args}} \ |
| 39 |
$command \ |
| 40 |
-- $command_args $command_args_foreground |
| 41 |
rc=$? |
Archives