--- net/haproxy-devel/files/haproxy.in.orig	2015-03-12 15:33:31.000000000 +0100
+++ net/haproxy-devel/files/haproxy.in	2017-08-10 23:46:14.870595000 +0200
@@ -32,14 +32,21 @@
 extra_commands="reload configtest"
 reload_cmd="haproxy_reload"
 stop_cmd="haproxy_stop"
+stop_precmd="haproxy_pre_check"
+restart_precmd="haproxy_pre_check"
 
 : ${haproxy_enable:="NO"}
 : ${haproxy_config:="%%PREFIX%%/etc/${name}.conf"}
 pidfile=${haproxy_pidfile:-"/var/run/haproxy.pid"}
 
-if [ -z "$rc_force" ]; then
-    sig_stop="USR1"
-fi
+# rc_force check can only be done at the run_rc_command
+# time, so we're testing it in the pre* hooks.
+haproxy_pre_check()
+{
+    if [ -z "${rc_force}" ]; then
+        sig_stop="USR1"
+    fi
+}
 
 load_rc_config $name
 
@@ -81,6 +88,7 @@
 configtest_cmd="$command -c -f $haproxy_config"
 start_precmd="$command -q -c -f $haproxy_config"
 required_files=$haproxy_config
+sig_stop="${haproxy_sig_stop:-TERM}"
 
 haproxy_reload()
 {