Merge branch 'master' into merge/master-into-dev

2020-10-10 14:04:31 +02:00
parent e179ab0b27 ebd0847364
commit 51f45b1413
7 changed files with 36 additions and 3 deletions
--- a/transmission/start.sh
+++ b/transmission/start.sh
@@ -63,7 +63,7 @@ if [[ "true" = "$DROP_DEFAULT_ROUTE" ]]; then
  ip r del default || exit 1
 fi

-if [[ "true" = "$DOCKER_LOG" ]]; then
+if [[ "true" = "$DOCKER_LOG" || "true" = "$LOG_TO_STDOUT" ]]; then
  LOGFILE=/dev/stdout
 else
  LOGFILE=${TRANSMISSION_HOME}/transmission.log