collectd: fix init status

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

(From meta-openembedded rev: f0cde44d55c949efc7902268e44a3784ed0a53ec)

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.init b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.init
index abdb194..95f5f73 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.init
+++ b/meta-openembedded/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"