From 0cf5d27d312bb5898eaf3c701bcf4f449414a7ff Mon Sep 17 00:00:00 2001
From: Dmitry Sivachenko <demon@FreeBSD.org>
Date: Tue, 5 Jun 2012 17:45:41 +0000
Subject: Add $FreeBSD$; Add LOGIN to REQUIRE; replace echo + return with err.

Suggested by:	dougb
---
 net/haproxy-devel/files/haproxy.in | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'net/haproxy-devel/files/haproxy.in')

diff --git a/net/haproxy-devel/files/haproxy.in b/net/haproxy-devel/files/haproxy.in
index 2ee0406145cf..2076db94911e 100644
--- a/net/haproxy-devel/files/haproxy.in
+++ b/net/haproxy-devel/files/haproxy.in
@@ -1,7 +1,10 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
 
 # PROVIDE: haproxy
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON LOGIN
 # KEYWORD: shutdown
 
 #######
@@ -59,8 +62,7 @@ haproxy_reload()
 	# Check configuration file quietly first
 	${command} -q -c -f ${haproxy_config}
 	if [ $? -ne 0 ]; then
-		echo "Error found in ${haproxy_config} - not reloading current process!"
-		return 1
+		err 1 "Error found in ${haproxy_config} - not reloading current process!"
 	fi
 	rc_pid=$(check_pidfile ${haproxy_pidfile} ${command})
 	if [ $rc_pid ]; then
@@ -70,8 +72,7 @@ haproxy_reload()
 			${command} ${haproxy_flags} -sf ${rc_pid}
 		fi
 	else
-		echo "No process found.  Maybe $command isn't running?"
-		return 1
+		err 1 "No process found.  Maybe $command isn't running?"
 	fi
 }
 
-- 
cgit v1.2.3