Move the -- from DAEMON_ARGS to actual command.

This commit is contained in:
Darren 'Tadgy' Austin 2022-10-15 22:45:38 +01:00
commit e56dce32a3

View file

@ -7,7 +7,7 @@
SERVICE_EXEC="%BUILD_PREFIX%/bin/msmtpd" SERVICE_EXEC="%BUILD_PREFIX%/bin/msmtpd"
SERVICE_ARGS=('--log=syslog') SERVICE_ARGS=('--log=syslog')
DAEMON_EXEC="/usr/bin/daemon" DAEMON_EXEC="/usr/bin/daemon"
DAEMON_ARGS=('-N' '-n' "${0##*rc.}" '-r' '-a' '60' '-A' '5' '-L' '3600' '-M' '3' '-l' 'daemon.err' '-b' 'daemon.debug' '-o' 'daemon.info' '--') DAEMON_ARGS=('-N' '-n' "${0##*rc.}" '-r' '-a' '60' '-A' '5' '-L' '3600' '-M' '3' '-l' 'daemon.err' '-b' 'daemon.debug' '-o' 'daemon.info')
# Allow configuration in /etc/default to override. # Allow configuration in /etc/default to override.
# Additional available variables: # Additional available variables:
@ -59,7 +59,7 @@ startdaemon() {
} }
# shellcheck disable=SC2048,SC2046,SC2086 # shellcheck disable=SC2048,SC2046,SC2086
${DAEMON_ENVIRONMENT:+declare ${DAEMON_ENVIRONMENT[*]};} "$DAEMON_EXEC" ${DAEMON_ARGS[*]} ${DAEMON_EXTRA_ARGS[*]} \ ${DAEMON_ENVIRONMENT:+declare ${DAEMON_ENVIRONMENT[*]};} "$DAEMON_EXEC" ${DAEMON_ARGS[*]} ${DAEMON_EXTRA_ARGS[*]} \
$(printf -- "-e \"%s\" " "${SERVICE_ENVIRONMENT[@]}") "$SERVICE_EXEC" ${SERVICE_ARGS[*]} ${SERVICE_EXTRA_ARGS[*]} $(printf -- "-e \"%s\" " "${SERVICE_ENVIRONMENT[@]}") -- "$SERVICE_EXEC" ${SERVICE_ARGS[*]} ${SERVICE_EXTRA_ARGS[*]}
# shellcheck disable=SC2181 # shellcheck disable=SC2181
if (( $? != 0 )); then if (( $? != 0 )); then
error "error starting '${DAEMON_EXEC##*/}:'" error "error starting '${DAEMON_EXEC##*/}:'"