[Debian-eeepc-devel] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. f8367bd3d1a0ceb9675ee6781aec3053efbb54f8
Damyan Ivanov
dmn at debian.org
Fri Sep 5 22:40:35 UTC 2008
The following commit has been merged in the master branch:
commit 5d44f03ad8d7260b0fdbc529e56a3866fd44fe2d
Author: Damyan Ivanov <dmn at debian.org>
Date: Sat Sep 6 00:33:20 2008 +0300
functions/bluetooth: use hcitool only on $BLUETOOTH_FALLBACK_TO_HCITOOL
The idea is that some day the bluetooth control node will go into
mainline kernel and then we don't want to fallback to using
hcitool or un/loading modules blindly
diff --git a/functions.sh b/functions.sh
index 2606fc0..567ee5a 100644
--- a/functions.sh
+++ b/functions.sh
@@ -47,7 +47,11 @@ bluetooth_is_on()
if [ -e $BT_CTL ]; then
[ $( cat $BT_CTL ) = "1" ]
else
- hcitool dev | grep -q hci0
+ if [ "$BLUETOOTH_FALLBACK_TO_HCITOOL" = "yes" ]; then
+ hcitool dev | grep -q hci0
+ else
+ false
+ fi
fi
}
@@ -57,7 +61,7 @@ toggle_bluetooth()
if [ -e $BT_CTL ]; then
echo 0 > $BT_CTL
# udev should unload the module now
- else
+ elif [ "$BLUETOOTH_FALLBACK_TO_HCITOOL" = "yes" ]; then
hciconfig hci0 down
rmmod hci_usb
fi
@@ -65,7 +69,7 @@ toggle_bluetooth()
if [ -e $BT_CTL ]; then
echo 1 > $BT_CTL
# udev should load the module now
- else
+ elif [ "$BLUETOOTH_FALLBACK_TO_HCITOOL" = "yes" ]; then
modprobe hci_usb
fi
fi
--
Maintenance of eeepc-acpi-scripts debian package
More information about the Debian-eeepc-devel
mailing list