projects
/
platform
/
core
/
connectivity
/
bluetooth-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix incorrect path for bluetoothd
[platform/core/connectivity/bluetooth-tools.git]
/
scripts
/
etc
/
bt-stack-up.sh
diff --git
a/scripts/etc/bt-stack-up.sh
b/scripts/etc/bt-stack-up.sh
index
b48d955
..
e032d13
100644
(file)
--- a/
scripts/etc/bt-stack-up.sh
+++ b/
scripts/etc/bt-stack-up.sh
@@
-8,25
+8,20
@@
/usr/etc/bluetooth/bt-dev-start.sh
if !(/usr/bin/hciconfig | grep hci); then
/usr/etc/bluetooth/bt-dev-start.sh
if !(/usr/bin/hciconfig | grep hci); then
- echo "Registering BT device failed."
+ echo "Registering BT device
is
failed."
exit 1
fi
exit 1
fi
-# Execute BlueZ BT stack
-echo "Run bluetoothd"
-
# We have to handle both systemd and sysvinit cases differently
if [ -d /sys/fs/cgroup/systemd ]; then
# We have to handle both systemd and sysvinit cases differently
if [ -d /sys/fs/cgroup/systemd ]; then
- # bt-service changes USER via libprivilege-control, so it needs
+ # bt-service changes USER
to 'app'
via libprivilege-control, so it needs
# to know where the session bus is located under systemd
# to know where the session bus is located under systemd
- export DBUS_SESSION_BUS_ADDRESS=unix:path=$XDG_RUNTIME_DIR/dbus/user_bus_socket
-else
- # Under systemd, bluetoothd is dbus activated. sysvinit requires it to be
- # launched explicitly
- /lib/bluetooth/bluetoothd -E
+ export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/app/dbus/user_bus_socket
fi
fi
-/usr/bin/bt-service &
+# Execute BlueZ BT stack
+echo "Run bluetoothd"
+/usr/libexec/bluetooth/bluetoothd -d -C &
/usr/bin/bluetooth-share &
exit 0
/usr/bin/bluetooth-share &
exit 0