mirror of
https://github.com/OpenRC/openrc.git
synced 2024-11-23 09:53:45 +08:00
953172c6c6
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. |
||
---|---|---|
.. | ||
binfmt.sh.in | ||
cgroup-release-agent.sh.in | ||
functions.sh.in | ||
gendepends.sh.in | ||
init-early.sh.Linux.in | ||
init.sh.BSD.in | ||
init.sh.GNU-kFreeBSD.in | ||
init.sh.GNU.in | ||
init.sh.Linux.in | ||
meson.build | ||
openrc-run.sh.in | ||
rc-cgroup.sh | ||
rc-functions.sh | ||
rc-mount.sh | ||
runit.sh | ||
s6.sh | ||
start-stop-daemon.sh | ||
supervise-daemon.sh |