From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 22 Oct 2018 19:39:31 +0000 (+0200)
Subject: haproxy: Make /dev/log available in chroot
X-Git-Tag: v2.21-core125~39^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=699f0aa710932736d34dabf5a8c17287af29075c;p=ipfire-2.x.git

haproxy: Make /dev/log available in chroot

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/haproxy b/lfs/haproxy
index 9a54095a84..5e181a91e2 100644
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 
diff --git a/src/initscripts/packages/haproxy b/src/initscripts/packages/haproxy
index 78d64cee4e..ded627773f 100644
--- a/src/initscripts/packages/haproxy
+++ b/src/initscripts/packages/haproxy
@@ -11,6 +11,15 @@
 
 case "${1}" in
 	start)
+		# Prepare chroot
+		mkdir -p /var/lib/haproxy/dev
+
+		# Create link for syslog socket
+		if ! mountpoint /var/lib/haproxy/dev/log &>/dev/null; then
+			touch /var/lib/haproxy/dev/log
+			mount --bind /dev/log /var/lib/haproxy/dev/log
+		fi
+
 		boot_mesg "Starting HAProxy..."
 		loadproc /usr/sbin/haproxy -D -f /etc/haproxy/haproxy.cfg \
 			-p /var/run/haproxy.pid
@@ -19,6 +28,11 @@ case "${1}" in
 	stop)
 		boot_mesg "Stopping HAProxy..."
 		killproc /usr/sbin/haproxy
+
+		# umount /dev/log
+		if mountpoint /var/lib/haproxy/dev/log &>/dev/null; then
+			umount /var/lib/haproxy/dev/log
+		fi
 		;;
 
 	reload)