[maemo-commits] [maemo-commits] r13154 - projects/connectivity/osso-bluez-compat/trunk/etc

[From: subversion at stage.maemo.org]

Author: jh
Date: 2007-08-13 15:21:39 +0300 (Mon, 13 Aug 2007)
New Revision: 13154

Modified:
   projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh
Log:
Make sure device is UP also in backup restore script

Modified: projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh	2007-08-13 12:14:40 UTC (rev 13153)
+++ projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh	2007-08-13 12:21:39 UTC (rev 13154)
@@ -26,16 +26,8 @@
 	mv $OLD_DIR $CORRECT_DIR
 fi
 
-MODE = ""
+dbus-send --system --print-reply --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:connectable > /dev/null
 
-if [ -f "$CORRECT_DIR/config" ]; then
-	MODE=`egrep ^mode $CORRECT_DIR/config|awk '{ print $2 }'`
-fi
-
-if [ "$MODE" ]; then
-	dbus-send --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:$MODE
-fi
-
 NAME=""
 
 if [ "$1" ] && [ "`grep /etc/bluetooth/name $1`" ] && [ ! -f "$CORRECT_DIR/config" ]; then
@@ -49,3 +41,14 @@
 if [ "$NAME" ]; then
 	dbus-send --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetName string:"$NAME"
 fi
+
+MODE = ""
+
+if [ -f "$CORRECT_DIR/config" ]; then
+	MODE=`egrep ^mode $CORRECT_DIR/config|awk '{ print $2 }'`
+fi
+
+if [ "$MODE" ]; then
+	dbus-send --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:$MODE
+fi
+