[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/

[Ian Delaney]

commit:     11ee51482ad3c58c58da2be036bc6ee6440c43e4
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 08:22:32 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 08:23:19 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ee5148

app-admin/collectd: set required env var in file collectd.initd

fix thanks to Marcin Mirosław sourced from the gentoo bug.

Gentoo bug: #539262

Package-Manager: portage-2.2.20.1

 app-admin/collectd/files/collectd.initd | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-admin/collectd/files/collectd.initd b/app-admin/collectd/files/collectd.initd
index 4f48a11..10d2952 100644
--- a/app-admin/collectd/files/collectd.initd
+++ b/app-admin/collectd/files/collectd.initd
@@ -47,6 +47,7 @@ start() {
 
 	ebegin "Starting collectd"
 	start-stop-daemon --start --user "${COLLECTD_USER}:collectd" \
+		--env LC_NUMERIC=C \
 		--nicelevel "${COLLECTD_NICELVL}" --exec /usr/sbin/collectd -- \
 			-P "${COLLECTD_PIDFILE}" -C "${COLLECTD_CFGFILE}"
 	eend $? "Failed to start collectd"
@@ -55,6 +56,7 @@ start() {
 stop() {
 	ebegin "Stopping collectd"
 	start-stop-daemon --stop \
+		--env LC_NUMERIC=C \
 		--pidfile "${COLLECTD_PIDFILE}"
 	eend $? "Failed to stop collectd"
 }

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/

[Alexis Ballier]

commit:     8da22949f86a3d3f06b71be7e21187b88fae769a
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 17:33:38 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 17:33:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8da22949

app-admin/collectd: Fix oracle configuration check in init script _checkconfig.

Do not match if oracle plugin is not enabled, simplify a bit the expression and use wc -l instead of grep --count so that it works with busybox too.

Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 app-admin/collectd/files/collectd.initd-r1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/files/collectd.initd-r1 b/app-admin/collectd/files/collectd.initd-r1
index a90ec50..32510ff 100644
--- a/app-admin/collectd/files/collectd.initd-r1
+++ b/app-admin/collectd/files/collectd.initd-r1
@@ -28,7 +28,7 @@ depend() {
 }
 
 _checkconfig() {
-	if [ $(eval sed '/^$\|^#/d' \"${COLLECTD_CONFIGFILE}\" | grep --count 'LoadPlugin[[:space:]]\+oracle') -ge 1 ] ; then
+	if [ $(sed '/^$\|^#/d' "${COLLECTD_CONFIGFILE}" | grep 'LoadPlugin[[:space:]]\+oracle' | wc -l) -ge 1 ] ; then
 		if [ -e /etc/env.d/50oracle-instantclient-basic ] ; then
 			. /etc/env.d/50oracle-instantclient-basic
 			export ORACLE_HOME