| 1 |
commit: 3bcdeba639f732a956fa00841707f5026a5b3665 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 23 17:00:26 2017 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 23 17:00:26 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bcdeba6 |
| 7 |
|
| 8 |
app-admin/consul: fix duplicate command_args in openrc init script |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
app-admin/consul/files/consul.initd | 4 ++-- |
| 13 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-admin/consul/files/consul.initd b/app-admin/consul/files/consul.initd |
| 16 |
index 1fb48d0..751d68c 100644 |
| 17 |
--- a/app-admin/consul/files/consul.initd |
| 18 |
+++ b/app-admin/consul/files/consul.initd |
| 19 |
@@ -1,5 +1,5 @@ |
| 20 |
#!/sbin/openrc-run |
| 21 |
-# Copyright 2015 Gentoo Foundation |
| 22 |
+# Copyright 2015-2017 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
# $Id$ |
| 25 |
|
| 26 |
@@ -11,7 +11,7 @@ pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"} |
| 27 |
user=${user:-${SVCNAME}} |
| 28 |
|
| 29 |
command="/usr/bin/${SVCNAME}" |
| 30 |
-command_args="agent -config-dir=/etc/consul.d ${command_args}" |
| 31 |
+command_args="agent ${command_args:-config-dir=/etc/consul.d}" |
| 32 |
command_background="true" |
| 33 |
start_stop_daemon_args="--user ${user} --group ${group} \ |
| 34 |
--stdout /var/log/${SVCNAME}/${SVCNAME}.log \ |
Archives