aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2012-05-04 00:21:53 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2012-05-08 13:17:15 -0700
commit2ea98a6a043710ad4958355b62c682b4767f292e (patch)
tree8be42207c9aa2b153adecf9a311b2902485cc9d1
parent9dc57699c20f1cbf9c47fe3b8edfcde2b0e4a3e4 (diff)
downloadbluez-2ea98a6a043710ad4958355b62c682b4767f292e.tar.gz
bluez-2ea98a6a043710ad4958355b62c682b4767f292e.tar.xz
bluez-2ea98a6a043710ad4958355b62c682b4767f292e.zip
udev: remove udev activation of the blutooth daemon
Udev is not meant to spawn long-running processes, and as of the next udev version such processes will be killed. If using systemd, device activation can be used to get the same effect. On Arch we have been disabling this rule for a long time, even though we don't use systemd, as it was causing more problems than it was worth.
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac3
-rw-r--r--scripts/bluetooth.rules.in4
3 files changed, 3 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 62705f6a..44e82c0c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -389,7 +389,7 @@ include Makefile.tools
if DATAFILES
rulesdir = @UDEV_DIR@/rules.d
-udev_files = scripts/bluetooth.rules
+udev_files =
if HID2HCI
udev_files += scripts/bluetooth-hid2hci.rules
@@ -408,8 +408,7 @@ endif
CLEANFILES += $(rules_DATA)
-EXTRA_DIST += scripts/bluetooth.rules \
- scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules
+EXTRA_DIST += scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules
EXTRA_DIST += doc/manager-api.txt \
doc/adapter-api.txt doc/device-api.txt \
diff --git a/configure.ac b/configure.ac
index f2989092..44f33adf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,5 +71,4 @@ if (test -n "${path_systemdunit}"); then
fi
AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
-AC_OUTPUT(Makefile scripts/bluetooth.rules doc/version.xml
- src/bluetoothd.8 src/bluetooth.service bluez.pc)
+AC_OUTPUT(Makefile doc/version.xml src/bluetoothd.8 src/bluetooth.service bluez.pc)
diff --git a/scripts/bluetooth.rules.in b/scripts/bluetooth.rules.in
deleted file mode 100644
index 64df69d5..00000000
--- a/scripts/bluetooth.rules.in
+++ /dev/null
@@ -1,4 +0,0 @@
-# Run helper every time a Bluetooth device appears
-# On remove actions, bluetoothd should go away by itself
-ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd --udev"
-ACTION=="change", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd --udev"