diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2009-07-06 10:29:57 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2009-07-06 10:29:57 -0700 |
| commit | 1f40f75b3280bab66c0d1bbe122bdf8aa2baed5a (patch) | |
| tree | 21480818d0eec3a4b96e18081e6ca703b0afd8d5 /scripts | |
| parent | 26547c0b52e4fcc330f63368fc3271a2b71db487 (diff) | |
| download | bluez-1f40f75b3280bab66c0d1bbe122bdf8aa2baed5a.tar.gz | |
Generate bluetooth.rules with the correct prefix
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 3 | ||||
| -rw-r--r-- | scripts/bluetooth.default | 1 | ||||
| -rw-r--r-- | scripts/bluetooth.init | 42 | ||||
| -rw-r--r-- | scripts/bluetooth.rules.in (renamed from scripts/bluetooth.rules) | 2 |
4 files changed, 2 insertions, 46 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 1f4e5c28..cbd30b13 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -21,8 +21,7 @@ endif CLEANFILES = $(rules_DATA) -EXTRA_DIST = bluetooth.init bluetooth.default bluetooth.rules \ - bluetooth-hid2hci.rules bluetooth-serial.rules bluetooth_serial +EXTRA_DIST = bluetooth-hid2hci.rules bluetooth-serial.rules bluetooth_serial MAINTAINERCLEANFILES = Makefile.in diff --git a/scripts/bluetooth.default b/scripts/bluetooth.default deleted file mode 100644 index cdf37fa1..00000000 --- a/scripts/bluetooth.default +++ /dev/null @@ -1 +0,0 @@ -# Bluetooth configuraton file diff --git a/scripts/bluetooth.init b/scripts/bluetooth.init deleted file mode 100644 index 3ea8a89b..00000000 --- a/scripts/bluetooth.init +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# Start/stop the Bluetooth daemons -# - -set -e - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -NAME=bluetooth -DESC="Bluetooth subsystem" - -DAEMON_NAME=bluetoothd - -DAEMON_EXEC="`which $DAEMON_NAME || true`" - -DAEMON_ENABLE=true - -[ -e /etc/default/bluetooth ] && . /etc/default/bluetooth - -case "$1" in - start) - echo -n "Starting $DESC:" - if $DAEMON_ENABLE && [ -x "$DAEMON_EXEC" ]; then - $DAEMON_EXEC - echo -n " $DAEMON_NAME" - fi - echo "." - ;; - stop) - echo -n "Stopping $DESC:" - killall $DAEMON_NAME > /dev/null 2>&1 || true - echo -n " $DAEMON_NAME" - echo "." - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/scripts/bluetooth.rules b/scripts/bluetooth.rules.in index 2a836050..6809e9d7 100644 --- a/scripts/bluetooth.rules +++ b/scripts/bluetooth.rules.in @@ -1,3 +1,3 @@ # Run helper every time a Bluetooth device appears # On remove actions, bluetoothd should go away by itself -ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/bluetoothd --udev" +ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd --udev" |