aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Frey <dpfrey@gmail.com>2019-01-10 11:23:52 -0800
committerArmin Kuster <akuster808@gmail.com>2019-04-13 12:46:44 -0700
commit383425fb86fdeccad88080369078d9ac988bab2f (patch)
tree518bcf80833cf22002ead4ec7720e456e339eb7f
parent0ae5ff4c0adc5fd727e5c5c47aba8c7859d60a73 (diff)
downloadopenembedded-core-383425fb86fdeccad88080369078d9ac988bab2f.tar.gz
bluez5: Fix status subcommand of init script
Update the bluez5 init script to resolve an issue where the status subcommand would exit without printing any message if bluez was not running. The early exit was caused by the fact that the init script has "set -e". When "pidof ${DAEMON} >/dev/null" is executed, the script terminates immediately if bluez isn't running because pidof returns a non-zero result. The fixed version does not suffer from this issue and makes use of the "status" function from the functions library. Signed-off-by: David Frey <dpfrey@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5/init12
1 files changed, 4 insertions, 8 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5/init b/meta/recipes-connectivity/bluez5/bluez5/init
index d7972f2d95..ca9fa18549 100644
--- a/meta/recipes-connectivity/bluez5/bluez5/init
+++ b/meta/recipes-connectivity/bluez5/bluez5/init
@@ -1,5 +1,8 @@
#!/bin/sh
+# Source function library
+. /etc/init.d/functions
+
PATH=/sbin:/bin:/usr/sbin:/usr/bin
DESC=bluetooth
@@ -44,14 +47,7 @@ case $1 in
$0 start
;;
status)
- pidof ${DAEMON} >/dev/null
- status=$?
- if [ $status -eq 0 ]; then
- echo "bluetooth is running."
- else
- echo "bluetooth is not running"
- fi
- exit $status
+ status ${DAEMON} || exit $?
;;
*)
N=/etc/init.d/bluetooth