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

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

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---

diff --git a/app-admin/consul/files/consul.initd b/app-admin/consul/files/consul.initd
index 1fb48d016aa1..751d68c3cc51 100644
--- a/app-admin/consul/files/consul.initd
+++ b/app-admin/consul/files/consul.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 2015 Gentoo Foundation
+# Copyright 2015-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
 user=${user:-${SVCNAME}}
 
 command="/usr/bin/${SVCNAME}"
-command_args="agent -config-dir=/etc/consul.d ${command_args}"
+command_args="agent ${command_args:-config-dir=/etc/consul.d}"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
 	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \