summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDavid Frey <dpfrey@gmail.com>2019-01-10 11:23:52 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-22 00:31:48 +0100
commit3a9be513593d64188d1a393b9a8e720bbfe0da58 (patch)
treeded7b8a610e9a1da72ae9700019acd93f034135d /meta
parentc184fa0892fefe796da9b34bd9165d2707456ce2 (diff)
downloadpoky-3a9be513593d64188d1a393b9a8e720bbfe0da58.tar.gz
poky-3a9be513593d64188d1a393b9a8e720bbfe0da58.tar.bz2
poky-3a9be513593d64188d1a393b9a8e720bbfe0da58.zip
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. (From OE-Core rev: 383425fb86fdeccad88080369078d9ac988bab2f) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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