Iwan/baseimage-docker_fr
1
0
Fork 0
forked from Docker/baseimage-docker
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into Theaxiom-patch-2

Browse Source
This commit is contained in:
Travis Rowland
2017-11-23 15:12:00 -08:00
committed by GitHub
parent 338238d685 06e2983ba9
commit 95d89dd251
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
image/services/syslog-ng/syslog-ng.init
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
set -e set -em
# If /dev/log is either a named pipe or it was placed there accidentally, # 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, # e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25,

3
image/services/syslog-ng/syslog-ng.shutdown
View File

@@ -20,5 +20,8 @@ syslogng_wait() {
return $RET return $RET
} }
if [ -f "$PIDFILE" ]; then
kill $(cat "$PIDFILE") kill $(cat "$PIDFILE")
fi
syslogng_wait 0 $? syslogng_wait 0 $?