Slackware/repo
1
0
Fork 0
Code Releases Wiki Activity

Move -- from DAEMON_ARGS to command line.

Browse source
This commit is contained in:
Darren 'Tadgy' Austin 2022-10-15 23:04:16 +01:00
commit 98cc9a0be0
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
templates/rc.d/rc.template-daemon
View file

@ -7,7 +7,7 @@
SERVICE_EXEC="%BUILD_PREFIX%/EDITME"
SERVICE_ARGS=('EDITME')
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.
# Additional available variables:
@ -59,7 +59,7 @@ startdaemon() {
}
# shellcheck disable=SC2048,SC2046,SC2086
${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
if (( $? != 0 )); then
error "error starting '${DAEMON_EXEC##*/}:'"

4
templates/rc.d/rc.template-daemon-runuser
View file

@ -8,7 +8,7 @@ SERVICE_EXEC="%BUILD_PREFIX%/EDITME"
SERVICE_ARGS=('EDITME')
SERVICE_RUNUSER="EDITME"
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.
# Additional available variables:
@ -68,7 +68,7 @@ startdaemon() {
return 2
}
su - "${SERVICE_RUNUSER:-$(whoami)}" -c "${DAEMON_ENVIRONMENT:+declare ${DAEMON_ENVIRONMENT[*]};} \"$DAEMON_EXEC\" ${DAEMON_ARGS[*]} \
${DAEMON_EXTRA_ARGS[*]} $(printf -- "-e \"%s\" " "${SERVICE_ENVIRONMENT[@]}") \"$SERVICE_EXEC\" ${SERVICE_ARGS[*]} ${SERVICE_EXTRA_ARGS[*]}"
${DAEMON_EXTRA_ARGS[*]} $(printf -- "-e \"%s\" " "${SERVICE_ENVIRONMENT[@]}") -- \"$SERVICE_EXEC\" ${SERVICE_ARGS[*]} ${SERVICE_EXTRA_ARGS[*]}"
# shellcheck disable=SC2181
if (( $? != 0 )); then
error "error starting '${DAEMON_EXEC##*/}'"