summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJavier Viguera <javier.viguera@digi.com>2017-07-18 18:32:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-30 11:14:26 +0100
commit489e2e3243d7acdcb9c1f9de110139b6636d5594 (patch)
treee27b0adb2f79adc1115f337b9b51ea2ab3f58583 /meta
parent0731fd41dbbe8d2dd7118219cd12bb7a73fed4fd (diff)
downloadpoky-489e2e3243d7acdcb9c1f9de110139b6636d5594.tar.gz
bluez5: cosmetic fixes to bluetooth bootscript
Fix booting messages wrapped over two different lines: Starting bluetooth bluetoothd Stopping bluetooth /usr/libexec/bluetooth/bluetoothd Also reworked whitespace (removed some empty lines). (From OE-Core rev: 62f1122ef166eba56441d669c6b3b3fe5f367418) Signed-off-by: Javier Viguera <javier.viguera@digi.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5/init15
1 files changed, 6 insertions, 9 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5/init b/meta/recipes-connectivity/bluez5/bluez5/init
index 489e9b9eba..d7972f2d95 100644
--- a/meta/recipes-connectivity/bluez5/bluez5/init
+++ b/meta/recipes-connectivity/bluez5/bluez5/init
@@ -21,25 +21,22 @@ set -e
21 21
22case $1 in 22case $1 in
23 start) 23 start)
24 echo "Starting $DESC" 24 echo -n "Starting $DESC: "
25
26 if test "$BLUETOOTH_ENABLED" = 0; then 25 if test "$BLUETOOTH_ENABLED" = 0; then
27 echo "disabled. see /etc/default/bluetooth" 26 echo "disabled (see /etc/default/bluetooth)."
28 exit 0 27 exit 0
29 fi 28 fi
30
31 start-stop-daemon --start --background $SSD_OPTIONS 29 start-stop-daemon --start --background $SSD_OPTIONS
32 echo "${DAEMON##*/}" 30 echo "${DAEMON##*/}."
33
34 ;; 31 ;;
35 stop) 32 stop)
36 echo "Stopping $DESC" 33 echo -n "Stopping $DESC: "
37 if test "$BLUETOOTH_ENABLED" = 0; then 34 if test "$BLUETOOTH_ENABLED" = 0; then
38 echo "disabled." 35 echo "disabled (see /etc/default/bluetooth)."
39 exit 0 36 exit 0
40 fi 37 fi
41 start-stop-daemon --stop $SSD_OPTIONS 38 start-stop-daemon --stop $SSD_OPTIONS
42 echo "${DAEMON}" 39 echo "${DAEMON##*/}."
43 ;; 40 ;;
44 restart|force-reload) 41 restart|force-reload)
45 $0 stop 42 $0 stop