Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/serf/files/
Date: Mon, 23 Jan 2017 16:57:40
Message-Id: 1485190586.48ee36cd30b2cfc46e6ea50108cd3b65f4b93c36.zmedico@gentoo
1 commit: 48ee36cd30b2cfc46e6ea50108cd3b65f4b93c36
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 23 16:54:29 2017 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 23 16:56:26 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48ee36cd
7
8 app-admin/serf: fix duplicate command_args in openrc init script
9
10 Suggested-by: Manuel RĂ¼ger <mrueg <AT> gentoo.org>
11 Package-Manager: Portage-2.3.3, Repoman-2.3.1
12
13 app-admin/serf/files/serf.initd | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16 diff --git a/app-admin/serf/files/serf.initd b/app-admin/serf/files/serf.initd
17 index ce69aea..bc3b963 100644
18 --- a/app-admin/serf/files/serf.initd
19 +++ b/app-admin/serf/files/serf.initd
20 @@ -10,7 +10,7 @@ pidfile=${pidfile:-"/run/${RC_SVCNAME}/${RC_SVCNAME}.pid"}
21 user=${user:-${RC_SVCNAME}}
22
23 command="/usr/bin/${RC_SVCNAME}"
24 -command_args="agent -config-dir=/etc/serf.d ${command_args}"
25 +command_args="agent ${command_args:-config-dir=/etc/serf.d}"
26 command_background="true"
27 start_stop_daemon_args="--user ${user} --group ${group} \
28 --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \