[oe-commits] Wenzong Fan : collectd: fix init status

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: ac3543aba78686e320bfcfb35baab4356d6d5fb3
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=ac3543aba78686e320bfcfb35baab4356d6d5fb3

Author: Wenzong Fan <wenzong.fan at windriver.com>
Date:   Tue Apr  8 17:07:49 2014 +0800

collectd: fix init status

Fix init status to get it works with 'service --status-all'.

Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-extended/collectd/collectd/collectd.init | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/collectd/collectd/collectd.init b/meta-oe/recipes-extended/collectd/collectd/collectd.init
index abdb194..95f5f73 100644
--- a/meta-oe/recipes-extended/collectd/collectd/collectd.init
+++ b/meta-oe/recipes-extended/collectd/collectd/collectd.init
@@ -146,6 +146,17 @@ d_stop() {
 	return "$rc"
 }
 
+# return:
+#   0 if the daemon is running
+#   3 if the daemon is stopped
+d_status(){
+	if test "$USE_COLLECTDMON" == 1; then
+		status $COLLECTDMON_DAEMON
+	else
+		status $DAEMON
+	fi
+}
+
 case "$1" in
 	start)
 		echo -n "Starting $NAME"
@@ -164,7 +175,7 @@ case "$1" in
 		esac
 		;;
 	status)
-		status_of_proc -p "$_PIDFILE" "$DAEMON" "$NAME" && exit 0 || exit $?
+		d_status
 		;;
 	restart|force-reload)
 		echo -n "Restarting $NAME"