op_bluetooth: update for new kernel

[openpandora.oe.git] / recipes / pandora-system / pandora-scripts / op_bluetooth.sh

diff --git a/recipes/pandora-system/pandora-scripts/op_bluetooth.sh b/recipes/pandora-system/pandora-scripts/op_bluetooth.sh
index 93615ff..b63fe76 100644 (file)
--- a/recipes/pandora-system/pandora-scripts/op_bluetooth.sh
+++ b/recipes/pandora-system/pandora-scripts/op_bluetooth.sh
@@ -9,16 +9,21 @@ cd "$HOME"
 if [ "$1" = "startup" ]; then
        [ -f "$LOCK" ] && sudo /usr/sbin/hciconfig "$INTERFACE" up pscan 1>/dev/null && sudo /usr/sbin/bluetoothd || echo "Bluetooth: User has not enabled Bluetooth." 
 
-else
-       
+else   
        # Figure out if Bluetooth is running or not
        
        if hciconfig "$INTERFACE" | grep UP &>/dev/null
        then
                notify-send -u normal "Bluetooth" "Bluetooth is being disabled..." -i blueman -t 5000
                sudo /usr/sbin/hciconfig ${INTERFACE} down 1>/dev/null
+               sudo /usr/pandora/scripts/op_bluetooth_work.sh 0
                rm -f "$LOCK"
        else
+               if ! sudo /usr/pandora/scripts/op_bluetooth_work.sh 1; then
+                       notify-send -u normal "Bluetooth" "Bluetooth error" -i blueman -t 3000
+                       exit 1
+               fi
+
                pgrep bluetoothd
                echo $INTERFACE
                 if [ $? -ne 1 ]; then
@@ -27,7 +32,6 @@ else
                        sudo /usr/sbin/hciconfig ${INTERFACE} up pscan 1>/dev/null
                        sudo /usr/sbin/bluetoothd 1>/dev/null
                        touch "$LOCK"
-
                fi
        fi
 fi