From be8fc49e520e76a72cb688d28e374ab0845e00fe Mon Sep 17 00:00:00 2001
From: David Hiendl <david.hiendl@dhswt.de>
Date: Thu, 22 Feb 2018 08:53:27 +0100
Subject: [PATCH] fixed syslog warning when using --tty as described in #468

---
 image/services/syslog-ng/syslog-ng.conf | 2 +-
 image/services/syslog-ng/syslog-ng.init | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/image/services/syslog-ng/syslog-ng.conf b/image/services/syslog-ng/syslog-ng.conf
index 11f6b41..b92d852 100644
--- a/image/services/syslog-ng/syslog-ng.conf
+++ b/image/services/syslog-ng/syslog-ng.conf
@@ -75,7 +75,7 @@ destination d_xconsole { pipe("/dev/xconsole"); };
 destination d_ppp { file("/var/log/ppp.log"); };
 
 # stdout for docker
-destination d_stdout { pipe("/dev/stdout"); };
+destination d_stdout { ##SYSLOG_OUTPUT_MODE_DEV_STDOUT##("/dev/stdout"); };
 
 ########################
 # Filters
diff --git a/image/services/syslog-ng/syslog-ng.init b/image/services/syslog-ng/syslog-ng.init
index 8a33b78..b10056d 100755
--- a/image/services/syslog-ng/syslog-ng.init
+++ b/image/services/syslog-ng/syslog-ng.init
@@ -7,6 +7,13 @@ set -em
 if [ ! -S /dev/log ]; then rm -f /dev/log; fi
 if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi
 
+# determine output mode on /dev/stdout because of the issue documented at https://github.com/phusion/baseimage-docker/issues/468
+if [ -p /dev/stdout ]; then
+  sed -i 's/##SYSLOG_OUTPUT_MODE_DEV_STDOUT##/pipe/' /etc/syslog-ng/syslog-ng.conf
+else
+  sed -i 's/##SYSLOG_OUTPUT_MODE_DEV_STDOUT##/file/' /etc/syslog-ng/syslog-ng.conf
+fi
+
 PIDFILE="/var/run/syslog-ng.pid"
 SYSLOGNG_OPTS=""