From 6edf516a1fe0ad4f4e8738f9fdd1bf0bc7718361 Mon Sep 17 00:00:00 2001 From: Austin English Date: Wed, 30 May 2018 11:11:10 -0500 Subject: [PATCH] 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=$?