Merge lp:~brendan-donegan/checkbox/bug877752_connect_wireless_vpn into lp:checkbox

[Brendan Donegan]

The connect_wireless script was previously free to choose to use a connection of any type from the list of previous connections, as long as it contained the SSID of router to which the user was connected. This led to at least one user having their VPN selected as the 'wireless' connection. This problem can be resolved by grep'ing for 'wireless' in the type of the connection.

[Brendan Donegan (brendan-donegan)]

This is an important fix for connect_wireless that needs to be SRU'ed, and as we all know changes proposed for SRU need to be in the development release first, so we should get this merged.

[Daniel Manrique (roadmr)]

This looks good, merging, hopefully will be OK to SRU once we've tested it.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-04 20:32:54 +0000
+++ debian/changelog	2011-11-09 14:21:24 +0000
@@ -1,11 +1,13 @@
 checkbox (0.13) precise; urgency=low
 
+  [Brendan Donegan]
+  * Ensure that connect_wireless chooses a wireless connection from the list of available connections (LP: #877752)
+
   [Marc Tardif]
   * Generate a submission.xml file that contains all device and attachment
     information, suitable for offline processing and submission.
   * Write the report before reporting the validation error.
   * Changed device.product to dmi.product for the formfactor (LP: #875312)
-
   [Daniel Manrique]
   * Use gettext for string (LP: #869267)
   * Move progress indicator to main checkbox dialog instead of a 
@@ -24,7 +26,7 @@
     * Changed remaining manual job descriptions to match the new format
 
    [Ara Pulido]
-   * Rewrote all job descriptions to match OEM QA syntax
+  [Marc Tardif]
 
  -- Daniel Manrique <[e-mail]>  Fri, 04 Nov 2011 16:32:08 -0400
 

=== modified file 'scripts/connect_wireless'
--- scripts/connect_wireless	2011-09-29 11:52:18 +0000
+++ scripts/connect_wireless	2011-11-09 14:21:24 +0000
@@ -8,7 +8,7 @@
 if [ $? -eq 0 ]
 then
     ap=$(echo $active_connection | awk -F\' '{print $2}')
-    conn=$(nmcli -t -f UUID,NAME con list | grep -e "$ap$" | awk -F\: '{print $1}')
+    conn=$(nmcli -t -f UUID,NAME,TYPE con list | grep wireless | grep -e "$ap$" | awk -F\: '{print $1}')
 else
     conn=$(nmcli -t -f UUID,TYPE con list | grep wireless | head -n 1 | awk -F\: '{print $1}')
 fi