From 0c3278af9077184947c9eeb190e1088d71953653 Mon Sep 17 00:00:00 2001 From: David Frey Date: Thu, 10 Jan 2019 11:23:52 -0800 Subject: 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: f6e03a43ee71c406fa8e68309624efd5384f437a) Signed-off-by: David Frey Signed-off-by: Richard Purdie --- meta/recipes-connectivity/bluez5/bluez5/init | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'meta/recipes-connectivity/bluez5') 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 -- cgit v1.2.3-54-g00ecf