From: Martin Pitt <martin@piware.de>
Date: Thu, 7 Nov 2013 05:31:07 +0000 (+0100)
Subject: phablet-install: use phablet-network, support $CHANNEL env
X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=commitdiff_plain;h=b7fd9424ef9c030d4b8ae786180740e29b0d809f

phablet-install: use phablet-network, support $CHANNEL env
---

diff --git a/phablet-install b/phablet-install
index 3cfccda..529e80f 100755
--- a/phablet-install
+++ b/phablet-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-CHANNEL=devel-proposed
+CHANNEL=${CHANNEL:=devel-proposed}
 MYNAME=$(getent passwd `whoami` | cut -f5 -d: | cut -f1 -d,)
 MYMAIL=${DEBMEMAIL:-$EMAIL}
 
@@ -17,9 +17,10 @@ echo "rebooting to activate writable image..."
 adb reboot
 adb wait-for-device
 
+# enable network
+phablet-network -n /etc/NetworkManager/system-connections/pittinet
+
 # install some necessary packages
-echo "connect to wifi now and press Enter"
-read n
 adb shell "apt-get install -y vim bzr ubuntu-ui-toolkit-autopilot ofono-phonesim"
 
 # set up bzr, vim, ssh