[package] update haproxy to 1.4.1 and add hotplug script (#6875)

[openwrt/svn-archive/archive.git] / net / haproxy / files / haproxy.init

diff --git a/net/haproxy/files/haproxy.init b/net/haproxy/files/haproxy.init
index 5e4ef1578d7390a10aa99216df74b04dbde29663..1b6b5a49b861a05bc4c325f460e01f38610fa262 100644 (file)
--- a/net/haproxy/files/haproxy.init
+++ b/net/haproxy/files/haproxy.init
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2010 OpenWrt.org
 
 START=99
 STOP=80
@@ -8,19 +8,26 @@ HAPROXY_BIN="/usr/sbin/haproxy"
 HAPROXY_CONFIG="/etc/haproxy.cfg"
 HAPROXY_PID="/var/run/haproxy.pid"
 
+boot() {
+
+       #Do nothing on boot
+       exit 0
+}
+
 start() {
        [ -x "$HAPROXY_BIN" ] || return 1
 
-       start-stop-daemon -S -b -x $HAPROXY_BIN -- \
-               -f "$HAPROXY_CONFIG" -V -D -d -p "$HAPROXY_PID"
+       start-stop-daemon -S -x $HAPROXY_BIN -- \
+               -f "$HAPROXY_CONFIG" -V -D -p "$HAPROXY_PID"
 }
 
 stop() {
-       start-stop-daemon -K -x $HAPROXY_BIN -p $HAPROXY_PID
-       rm -f $HAPROXY_PID
+       start-stop-daemon -q -K -x $HAPROXY_BIN -p $HAPROXY_PID
+       sleep 3
+       kill -0 `cat $HAPROXY_PID` 2>/dev/null && \
+               start-stop-daemon -q -K -s KILL -x $HAPROXY_BIN -p $HAPROXY_PID
 }
 
 reload() {
-       [ ! -f "$HAPROXY_PID" ] && start
        $HAPROXY_BIN -f $HAPROXY_CONFIG -p $HAPROXY_PID -st $(cat $HAPROXY_PID)
 }