emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh/supervise-daemon.sh: use start_stop_daemon_args if supervise_daemon_args is undefined

Browse Source
This commit is contained in:
Austin English 2018-05-30 11:11:10 -05:00 committed by Doug Freed
parent 7e56a49e23
commit 6edf516a1f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
man/openrc-run.8
View File

@ -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. to go down when stopping the service. The default is 60000.
.It Ar start_stop_daemon_args .It Ar start_stop_daemon_args
List of arguments passed to start-stop-daemon when starting the daemon. 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 .It Ar command
Daemon to start or stop via Daemon to start or stop via
.Nm start-stop-daemon .Nm start-stop-daemon

2
sh/supervise-daemon.sh
View File

@ -34,7 +34,7 @@ supervise_start()
${respawn_period:+--respawn-period} $respawn_period \ ${respawn_period:+--respawn-period} $respawn_period \
${command_user+--user} $command_user \ ${command_user+--user} $command_user \
${umask+--umask} $umask \ ${umask+--umask} $umask \
$supervise_daemon_args \ ${supervise_daemon_args:-${start_stop_daemon_args}} \
$command \ $command \
-- $command_args $command_args_foreground -- $command_args $command_args_foreground
rc=$? rc=$?