From 22bcd9e7846715faacd4d08c9799471c440ff41e Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sat, 9 Nov 2019 10:16:02 +0200 Subject: [PATCH] Revert "haproxy: Rework hotplug script for HAProxy" This reverts commit c9ee50d1900921f13319509396d69dae61e3f8ca. Signed-off-by: Hannu Nyman --- net/haproxy/Makefile | 4 ++-- net/haproxy/files/haproxy.hotplug | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 0d0cbcd4eb..3e891f418d 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -172,8 +172,8 @@ define Package/haproxy/install $(INSTALL_CONF) ./files/haproxy.cfg $(1)/etc/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/haproxy.init $(1)/etc/init.d/haproxy - $(INSTALL_DIR) $(1)/etc/hotplug.d/iface - $(INSTALL_BIN) ./files/haproxy.hotplug $(1)/etc/hotplug.d/iface/90-haproxy + $(INSTALL_DIR) $(1)/etc/hotplug.d/net + $(INSTALL_BIN) ./files/haproxy.hotplug $(1)/etc/hotplug.d/net/90-haproxy endef Package/haproxy-nossl/install = $(Package/haproxy/install) diff --git a/net/haproxy/files/haproxy.hotplug b/net/haproxy/files/haproxy.hotplug index 5913918a1d..bfb5d6da12 100644 --- a/net/haproxy/files/haproxy.hotplug +++ b/net/haproxy/files/haproxy.hotplug @@ -1,7 +1,7 @@ #!/bin/sh -[ "$INTERFACE" == "wan" ] || [ "$INTERFACE" == "lan" ] || return -[ "$ACTION" == "ifup" ] && +if [ "$ACTION" = add ]; then /etc/init.d/haproxy enabled && \ /etc/init.d/haproxy start +fi -- 2.30.2