From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 23 Jan 2017 16:54:29 +0000 (-0800)
Subject: app-admin/serf: fix duplicate command_args in openrc init script
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=48ee36cd30b2cfc46e6ea50108cd3b65f4b93c36;p=gentoo.git

app-admin/serf: fix duplicate command_args in openrc init script

Suggested-by: Manuel Rüger <mrueg@gentoo.org>
Package-Manager: Portage-2.3.3, Repoman-2.3.1
---

diff --git a/app-admin/serf/files/serf.initd b/app-admin/serf/files/serf.initd
index ce69aea1d627..bc3b9632af0e 100644
--- a/app-admin/serf/files/serf.initd
+++ b/app-admin/serf/files/serf.initd
@@ -10,7 +10,7 @@ pidfile=${pidfile:-"/run/${RC_SVCNAME}/${RC_SVCNAME}.pid"}
 user=${user:-${RC_SVCNAME}}
 
 command="/usr/bin/${RC_SVCNAME}"
-command_args="agent -config-dir=/etc/serf.d ${command_args}"
+command_args="agent ${command_args:-config-dir=/etc/serf.d}"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
 	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \