Slackware/bootstrap
1
0
Fork 0
Code Releases Wiki Activity

Cosmetic changes.

Browse source
This commit is contained in:
Darren 'Tadgy' Austin 2022-08-24 00:46:57 +01:00
commit 11a892a1c1
2 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rc.d/rc.modules.local
View file

@ -1,5 +1,4 @@
#!/bin/sh #!/bin/sh
# /etc/rc.d/rc.modules.local - Load locally configured kernel modules.
# Copyright (c) 2005-2022: # Copyright (c) 2005-2022:
# Darren 'Tadgy' Austin <darren (at) afterdark.org.uk> # Darren 'Tadgy' Austin <darren (at) afterdark.org.uk>
# Licensed under the terms of the GNU General Public License version 3. # Licensed under the terms of the GNU General Public License version 3.

28
rc.d/rc.seeder
View file

@ -13,14 +13,14 @@ RUNUSER="seeder"
# Allow configuration in /etc/default to override. # Allow configuration in /etc/default to override.
# Additional available variables: # Additional available variables:
# ENVIRONMENT=() # Extra environment passed to $SCREEN_EXEC. Must be an array. # ENVIRONMENT=() # Extra environment passed to $SCREEN_EXEC. Must be an array.
# RUNUSER="" # The username of the seeding user account. Default: seeder.
# SEEDS=() # The seeding sessions to start. Must be an array. # SEEDS=() # The seeding sessions to start. Must be an array.
# SLAY_DELAY="" # Delay between the SIGTERM and SIGKILL on a 'stop'. Default: 2s. # SLAY_DELAY="" # Delay between the SIGTERM and SIGKILL on a 'stop'. Default: 2s.
# RESTART_DELAY="" # Delay between stopping and starting on a 'restart'. Default: 2s. # RESTART_DELAY="" # Delay between stopping and starting on a 'restart'. Default: 2s.
# RUNUSER="" # The username of the seeding user account. Default: seeder. [[ -e "/etc/default/${0##*rc.}" ]] && { source "/etc/default/${0##*rc.}" || return 1 2>/dev/null || exit 1; }
[[ -e "/etc/default/${0##*rc.}" ]] && source "/etc/default/${0##*rc.}"
error() { error() {
printf "%s: %s\\n" "${BASH_SOURCE##*/}" "$*" >&2 printf "%s: %s\\n" "${BASH_SOURCE[0]##*/}" "$*" >&2
} }
checkconfigured() { checkconfigured() {
@ -38,15 +38,15 @@ checkstatus() {
if [[ ! -z "$(su - "${RUNUSER:-seeder}" -c "\"$DAEMON_EXEC\" --list 2>/dev/null")" ]]; then if [[ ! -z "$(su - "${RUNUSER:-seeder}" -c "\"$DAEMON_EXEC\" --list 2>/dev/null")" ]]; then
for SEED in "$@"; do for SEED in "$@"; do
if su - "${RUNUSER:-seeder}" -c "\"$DAEMON_EXEC\" --running -n \"seeder-$SEED\""; then if su - "${RUNUSER:-seeder}" -c "\"$DAEMON_EXEC\" --running -n \"seeder-$SEED\""; then
printf "%s: %s: %s\\n" "${BASH_SOURCE##*/}" "seed '$SEED'" "running" printf "%s: %s: %s\\n" "${BASH_SOURCE[0]##*/}" "seed '$SEED'" "running"
RET=${RET:+2} RET=${RET:+2}
else else
printf "%s: %s: %s\\n" "${BASH_SOURCE##*/}" "seed '$SEED'" "stopped" printf "%s: %s: %s\\n" "${BASH_SOURCE[0]##*/}" "seed '$SEED'" "stopped"
RET=${RET:-1} RET=${RET:-1}
fi fi
done done
else else
printf "%s: %s\\n" "${BASH_SOURCE##*/}" "all seeds stopped" printf "%s: %s\\n" "${BASH_SOURCE[0]##*/}" "all seeds stopped"
RET=1 RET=1
fi fi
return $RET return $RET
@ -57,16 +57,16 @@ startdaemon() {
local EXEC SEED ERR RET local EXEC SEED ERR RET
checkconfigured || { checkconfigured || {
error "seeding not started - pre-start checks failed" error "seeding not started - pre-start checks failed"
return 1 return 2
} }
for EXEC in "$SCREEN_EXEC" "$(su - "${RUNUSER:-seeder}" -c "printf \"%s\" \"$RTORRENTWRAPPER_EXEC\"")"; do for EXEC in "$SCREEN_EXEC" "$(su - "${RUNUSER:-seeder}" -c "printf \"%s\" \"$RTORRENTWRAPPER_EXEC\"")"; do
[[ ! -e "$EXEC" ]] && { [[ ! -e "$EXEC" ]] && {
error "$EXEC:" "not found" error "$EXEC:" "not found"
return 1 return 2
} }
[[ ! -x "$EXEC" ]] && { [[ ! -x "$EXEC" ]] && {
error "$EXEC:" "not executable" error "$EXEC:" "not executable"
return 1 return 2
} }
done done
su - "${RUNUSER:-seeder}" -c "${ENVIRONMENT:+declare ${ENVIRONMENT[*]};} \"$SCREEN_EXEC\" ${SCREEN_ARGS[*]} -ls" | grep -iv "dead" >/dev/null || { su - "${RUNUSER:-seeder}" -c "${ENVIRONMENT:+declare ${ENVIRONMENT[*]};} \"$SCREEN_EXEC\" ${SCREEN_ARGS[*]} -ls" | grep -iv "dead" >/dev/null || {
@ -74,7 +74,7 @@ startdaemon() {
ERR=$? ERR=$?
(( ERR != 0 )) && { (( ERR != 0 )) && {
error "failed to start background screen:" "Error code = $ERR" error "failed to start background screen:" "Error code = $ERR"
return $ERR return 2
} }
sleep 2 sleep 2
} }
@ -83,7 +83,7 @@ startdaemon() {
ERR=$? ERR=$?
(( ERR != 0 )) && { (( ERR != 0 )) && {
error "failed to add screen for '$SEED':" "Error code = $ERR" error "failed to add screen for '$SEED':" "Error code = $ERR"
RET=1 RET=2
continue continue
} }
sleep 1 sleep 1
@ -129,7 +129,7 @@ case "$OPT" in
'start') 'start')
if checkstatus "${@:-${SEEDS[@]}}" >/dev/null; then if checkstatus "${@:-${SEEDS[@]}}" >/dev/null; then
error "seeds already running" error "seeds already running"
printf " %s\\n" "Try: $BASH_SOURCE status $@" >&2 printf " %s\\n" "Try: ${BASH_SOURCE[0]} status $@" >&2
RET=1 RET=1
else else
startdaemon "${@:-${SEEDS[@]}}" startdaemon "${@:-${SEEDS[@]}}"
@ -144,7 +144,7 @@ case "$OPT" in
RET=$? RET=$?
elif (( ERR == 1 )); then elif (( ERR == 1 )); then
error "seeds already stopped" error "seeds already stopped"
printf " %s\\n" "Try: $BASH_SOURCE status" >&2 printf " %s\\n" "Try: ${BASH_SOURCE[0]} status" >&2
RET=1 RET=1
else else
error "unhandled status: $ERR" error "unhandled status: $ERR"
@ -174,7 +174,7 @@ case "$OPT" in
RET=$? RET=$?
;; ;;
*) *)
printf "%s\\n" "Usage: $BASH_SOURCE <start|stop|restart|status> [seeding session] ..." >&2 printf "%s\\n" "Usage: ${BASH_SOURCE[0]} <start|stop|restart|status> [seeding session] ..." >&2
RET=1 RET=1
;; ;;
esac esac