summaryrefslogtreecommitdiffstats
path: root/source/n/bluez/config
diff options
context:
space:
mode:
Diffstat (limited to 'source/n/bluez/config')
-rw-r--r--source/n/bluez/config/bluetooth.sh7
-rw-r--r--source/n/bluez/config/rc.bluetooth5
2 files changed, 2 insertions, 10 deletions
diff --git a/source/n/bluez/config/bluetooth.sh b/source/n/bluez/config/bluetooth.sh
deleted file mode 100644
index 22034551c..000000000
--- a/source/n/bluez/config/bluetooth.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Check whether /etc/rc.d/rc.bluetooth is executable before starting
-# the bluetooth subsystem for hotplugged bluetooth devices
-[ -x /etc/rc.d/rc.bluetooth ] && exec /usr/sbin/bluetoothd --udev
-exit 0
-
diff --git a/source/n/bluez/config/rc.bluetooth b/source/n/bluez/config/rc.bluetooth
index 12540d833..296c45422 100644
--- a/source/n/bluez/config/rc.bluetooth
+++ b/source/n/bluez/config/rc.bluetooth
@@ -1,12 +1,11 @@
#!/bin/sh
bluez_start() {
- # bluetoothd requires dbus, but dbus isn't started early enough during
- # system boot, so we have to re-trigger the events now
- udevadm trigger --subsystem-match=bluetooth --action=add
+ /usr/sbin/bluetoothd
}
bluez_stop() {
+ udevadm trigger --subsystem-match=bluetooth --action=remove
pkill -TERM bluetoothd 1>/dev/null 2>/dev/null
}