From: Michael Tremer Date: Wed, 7 Nov 2018 12:30:50 +0000 (+0000) Subject: Revert "haproxy: Make /dev/log available in chroot" X-Git-Tag: v2.21-core125~17 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=c19d29f70162ab7cfef4a69bc7cd32f267faaebe Revert "haproxy: Make /dev/log available in chroot" This reverts commit 699f0aa710932736d34dabf5a8c17287af29075c. Signed-off-by: Michael Tremer --- diff --git a/lfs/haproxy b/lfs/haproxy index 2cf23526e4..da56f889d4 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 = 6 +PAK_VER = 7 DEPS = "" diff --git a/src/initscripts/packages/haproxy b/src/initscripts/packages/haproxy index ded627773f..78d64cee4e 100644 --- a/src/initscripts/packages/haproxy +++ b/src/initscripts/packages/haproxy @@ -11,15 +11,6 @@ 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)