openrc/sh
Jakub Jirutka 953172c6c6 supervise-daemon: don't overwrite empty supervise_daemon_args
If supervise_daemon_args is not set *or empty*, it defaults to
`start_stop_daemon_args`. This is bad because supervise-daemon doesn't
accept the same options as `start-stop-daemon`. So if we set e.g.
`start_stop_daemon_args="--wait 50"`, but not `supervise_daemon_args`,
and the user adds `supervisor=supervise-daemon` to the corresponding
/etc/conf.d/<service> file, the service will fail to start due to
unrecognized option "wait".

It would be best to remove this fallback, but that might break some
existing scripts that depend on it. So this commit just changes it to
use `start_stop_daemon_args` as the default for `supervise_daemon_args`
only if `supervise_daemon_args` is not set at all, but not if it's
empty.

This at least simplifies workarounds; we can just add
`supervise_daemon_args="$supervise_daemon_args"` to init scripts.

This fixes #558.
2022-12-07 16:42:14 -06:00
..
binfmt.sh.in binfmt: ignore empty lines (#492) 2022-04-09 14:36:47 -04:00
cgroup-release-agent.sh.in use HEAD in git URIs to point to the default branch 2021-12-20 20:07:00 -05:00
functions.sh.in use HEAD in git URIs to point to the default branch 2021-12-20 20:07:00 -05:00
gendepends.sh.in use HEAD in git URIs to point to the default branch 2021-12-20 20:07:00 -05:00
init-early.sh.Linux.in use HEAD in git URIs to point to the default branch 2021-12-20 20:07:00 -05:00
init.sh.BSD.in use HEAD in git URIs to point to the default branch 2021-12-20 20:07:00 -05:00
init.sh.GNU-kFreeBSD.in use HEAD in git URIs to point to the default branch 2021-12-20 20:07:00 -05:00
init.sh.GNU.in use HEAD in git URIs to point to the default branch 2021-12-20 20:07:00 -05:00
init.sh.Linux.in init.sh: rework the /run setup for linux xystems 2021-03-22 15:47:21 -05:00
meson.build build: rename sh_dir variable to rc_shdir 2021-12-29 15:57:04 -06:00
openrc-run.sh.in use HEAD in git URIs to point to the default branch 2021-12-20 20:07:00 -05:00
rc-cgroup.sh use HEAD in git URIs to point to the default branch 2021-12-20 20:07:00 -05:00
rc-functions.sh rc-functions.sh: Remove addon support 2018-07-09 19:44:40 -05:00
rc-mount.sh use HEAD in git URIs to point to the default branch 2021-12-20 20:07:00 -05:00
runit.sh use HEAD in git URIs to point to the default branch 2021-12-20 20:07:00 -05:00
s6.sh use HEAD in git URIs to point to the default branch 2021-12-20 20:07:00 -05:00
start-stop-daemon.sh fix quoting of loggers in start-stop-daemon 2022-07-03 12:40:34 -05:00
supervise-daemon.sh supervise-daemon: don't overwrite empty supervise_daemon_args 2022-12-07 16:42:14 -06:00