From 25d13ef2b8c4bb2849ec9e3ac2cc12a6b4fd72c1 Mon Sep 17 00:00:00 2001
From: Steve Kamerman <stevekamerman@gmail.com>
Date: Wed, 1 Nov 2017 17:26:31 -0400
Subject: [PATCH 1/2] Gracefully handle syslog-ng shutdown

---
 image/services/syslog-ng/syslog-ng.shutdown | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/image/services/syslog-ng/syslog-ng.shutdown b/image/services/syslog-ng/syslog-ng.shutdown
index 0288004..7046d02 100755
--- a/image/services/syslog-ng/syslog-ng.shutdown
+++ b/image/services/syslog-ng/syslog-ng.shutdown
@@ -20,5 +20,8 @@ syslogng_wait() {
     return $RET
 }
 
-kill $(cat "$PIDFILE")
+if [ -f "$PIDFILE" ]; then
+    kill $(cat "$PIDFILE")
+fi
+
 syslogng_wait 0 $?

From b77633463fc6ece4c7b81858ce0ab1bd1b63272a Mon Sep 17 00:00:00 2001
From: Ryan Sundberg <ryan.sundberg@gmail.com>
Date: Wed, 22 Nov 2017 23:18:19 -0800
Subject: [PATCH 2/2] Fork syslog-ng into a new process group via bash monitor
 mode

This prevents SIGINT from a user interrupt from prematurely quitting syslog-ng.
See https://github.com/phusion/baseimage-docker/issues/450
---
 image/services/syslog-ng/syslog-ng.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/image/services/syslog-ng/syslog-ng.init b/image/services/syslog-ng/syslog-ng.init
index 04f526b..8a33b78 100755
--- a/image/services/syslog-ng/syslog-ng.init
+++ b/image/services/syslog-ng/syslog-ng.init
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -em
 
 # If /dev/log is either a named pipe or it was placed there accidentally,
 # e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25,