]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
haproxy: Make /dev/log available in chroot
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Oct 2018 19:39:31 +0000 (21:39 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Oct 2018 19:40:56 +0000 (21:40 +0200)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/haproxy
src/initscripts/packages/haproxy

index 9a54095a84c2037a1fbecee40e96aeaa71e0cac5..5e181a91e2b3566e51a9621dcc75eed2f2cd9523 100644 (file)
@@ -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       = ""
 
index 78d64cee4e2309facc174b665a919041797d72ba..ded627773f5d1e02b1d06f4a0423f08e969b6785 100644 (file)
 
 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)