Revert "haproxy: Make /dev/log available in chroot"
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 7 Nov 2018 12:30:50 +0000 (12:30 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 7 Nov 2018 20:07:53 +0000 (20:07 +0000)
This reverts commit 699f0aa710932736d34dabf5a8c17287af29075c.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/haproxy
src/initscripts/packages/haproxy

index 2cf2352..da56f88 100644 (file)
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
-PAK_VER    = 6
+PAK_VER    = 7
 
 DEPS       = ""
 
index ded6277..78d64ce 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
@@ -28,11 +19,6 @@ 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)