svn commit: r413616 - in head/net-mgmt/telegraf: . files

[Palle Girgensohn]

Author: girgen
Date: Mon Apr 18 23:28:09 2016
New Revision: 413616
URL: https://svnweb.freebsd.org/changeset/ports/413616

Log:
  telegraf_flags will be applied to /usr/bin/daemon
  unless we force it empty there and used it explicitally.

Modified:
  head/net-mgmt/telegraf/Makefile
  head/net-mgmt/telegraf/files/telegraf.in

Modified: head/net-mgmt/telegraf/Makefile
==============================================================================
--- head/net-mgmt/telegraf/Makefile	Mon Apr 18 21:57:33 2016	(r413615)
+++ head/net-mgmt/telegraf/Makefile	Mon Apr 18 23:28:09 2016	(r413616)
@@ -3,6 +3,7 @@
 
 PORTNAME=	telegraf
 PORTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	girgen at FreeBSD.org

Modified: head/net-mgmt/telegraf/files/telegraf.in
==============================================================================
--- head/net-mgmt/telegraf/files/telegraf.in	Mon Apr 18 21:57:33 2016	(r413615)
+++ head/net-mgmt/telegraf/files/telegraf.in	Mon Apr 18 23:28:09 2016	(r413616)
@@ -26,8 +26,14 @@ load_rc_config $name
 : ${telegraf_conf:="%%PREFIX%%/etc/${name}.conf"}
 
 # daemon
+start_precmd=telegraf_prestart
 pidfile="/var/run/${name}.pid"
 command=/usr/sbin/daemon
 command_args="-crP ${pidfile} %%PREFIX%%/bin/${name} ${telegraf_flags} -config=${telegraf_conf} 2>> /var/log/telegraf.log"
 
+telegraf_prestart() {
+# Have to empty rc_flags so they don't get passed to daemon(8)
+        rc_flags=""
+}
+
 run_rc_command "$1"