Merge lp:~sergiusens/phablet-tools/1175806 into lp:phablet-tools

[Sergio Schvezov]

Waiting for an IP to be available before continuing with package install

We are now waiting for an IP before trying to update the package cache.

To test, make sure you have no connection on your device and run
./phablet-network-setup -i

Ideally you'd either get a timeout or no errors when updating.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:90
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-raring-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-raring-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-raring-i386-ci/36

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-tools-ci/42/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I don't think it waits long enough. I ran it and the loop finished _just_ before the wifi finished connecting.

alan@deep-thought:/tmp/1175806$ ./phablet-network-setup -i
[sudo] password for alan:
Network file is /etc/NetworkManager/system-connections/popey
Provisioning network file to device
restarting adbd as root
6 KB/s (284 bytes in 0.043s)

Network setup complete
Installing ssh
Network not ready, sleeping
Network not ready, sleeping
Network not ready, sleeping
alan@deep-thought:/tmp/1175806$

[lp:~sergiusens/phablet-tools/1175806]

91. By Sergio Schvezov on 2013-05-09

Adding packaging information

92. By Sergio Schvezov on 2013-05-09

Removing set -e and making the timeout longer

[Paul Larson (pwlars)]

Works on my mako, +1

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:92
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-raring-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-raring-armhf-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-raring-i386-ci/37

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-tools-ci/43/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Works nicely on a freshly flashed nexus 7

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-07 00:01:02 +0000
+++ debian/changelog	2013-05-09 20:54:26 +0000
@@ -1,3 +1,9 @@
+phablet-tools (0.13-0ubuntu1) UNRELEASED; urgency=low
+
+  * phablet-network-setup: adding wait before refreshing packagnig cache.
+
+ -- Sergio Schvezov <[e-mail]>  Thu, 09 May 2013 17:48:07 -0300
+
 phablet-tools (0.12daily13.05.07ubuntu.unity.next-0ubuntu1) raring; urgency=low
 
   * Automatic snapshot from revision 88 (ubuntu-unity/next)

=== modified file 'phablet-network-setup'
--- phablet-network-setup	2013-04-15 18:24:25 +0000
+++ phablet-network-setup	2013-05-09 20:54:26 +0000
@@ -14,8 +14,6 @@
 #
 # Copyright (C) 2012 Canonical, Ltd.
 
-set -e
-
 export LC_ALL=C
 
 usage() {
@@ -131,14 +129,26 @@
 EOF
 
     echo Installing ssh
-    wait=0
-    command=$(adb $ADBOPTS shell chroot /data/ubuntu /usr/bin/nmcli -t -f name,devices,vpn con status)
-    until [ -n "$command" ] || [ $wait -eq 4 ]; do
-        echo "Network not ready, sleeping"
-        command=$(adb $ADBOPTS shell chroot /data/ubuntu /usr/bin/nmcli -t -f name,devices,vpn con status)
-        sleep $(( wait++ ))
-    done
-    if [ -z "$command" ]; then
+    nmcli_cmd="adb $ADBOPTS shell chroot /data/ubuntu /usr/bin/nmcli"
+    wait=0
+    iface=$($nmcli_cmd -t -f devices con status | tr -d '\r')
+    until [ -n "$iface" ] || [ $wait -eq 10 ]; do
+        echo "Network not ready, sleeping"
+        iface=$($nmcli_cmd -t -f devices con status | tr -d '\r')
+        sleep $(( wait++ ))
+    done
+    if [ -z "$iface" ]; then
+        echo "Network setup timed out"
+        exit 1
+    fi
+    wait=0
+    ip_data=$($nmcli_cmd -t dev list iface $iface | grep ADDRESS)
+    until [ -n "$ip_data" ] || [ $wait -eq 10 ]; do
+        echo "Network not ready, sleeping"
+        ip_data=$($nmcli_cmd -t dev list iface $iface | grep ADDRESS)
+        sleep $(( wait++ ))
+    done
+    if [ -z "$ip_data" ]; then
         echo "Network setup timed out"
         exit 1
     fi