Merge lp:~cr3/checkbox/preseed_environment_info into lp:checkbox

[Marc Tardif]

The purpose of this branch is to support preseeding of the environment_info plugin to replace echo'ing into the checkbox.ini file.

[Marc Tardif (cr3)]

Don't worry about the changes to the default whitelist, it's just practical to have the __info__ section near the top so that we can do something like this:

head -n 32 data/whitelists/default.whitelist

[Brendan Donegan (brendan-donegan)]

Thanks for this, now we can use debconf to set these values in the preseeds

review: Approve

[Zygmunt Krynicki (zyga)]

130 +Template: checkbox/plugins/environment_info/open_n_ssid
131 +Type: string
132 +_Description: Open N SSID:
133 + The PSK of the 802.11n router with open security.

I assume you meant to say:

"The SSID of the 802.11n router with open security."

I don't know what the first part of the patch is doing though, is it unrelated?

review: Needs Fixing

[Zygmunt Krynicki (zyga)]

Please jettison from trunk

[Zygmunt Krynicki (zyga)]

My comment is no longer valid, it's been fixed in trunk with a separate MP

=== modified file 'data/whitelists/default.whitelist'
--- data/whitelists/default.whitelist	2012-08-31 16:50:00 +0000
+++ data/whitelists/default.whitelist	2012-09-11 14:01:19 +0000
@@ -16,6 +16,20 @@
 touchpad_scroll
 uname
 usb
+__info__
+codecs_attachment
+cpuinfo_attachment
+dmesg_attachment
+dmi_attachment
+dmidecode_attachment
+efi_attachment
+lsmod_attachment
+lspci_attachment
+modprobe_attachment
+modules_attachment
+sysfs_attachment
+sysctl_attachment
+udev_attachment
 __audio__
 audio/alsa_record_playback_external
 audio/alsa_record_playback_internal
@@ -49,20 +63,6 @@
 graphics/minimum_resolution
 graphics/driver_version
 graphics/VESA_drivers_not_in_use
-__info__
-codecs_attachment
-cpuinfo_attachment
-dmesg_attachment
-dmi_attachment
-dmidecode_attachment
-efi_attachment
-lsmod_attachment
-lspci_attachment
-modprobe_attachment
-modules_attachment
-sysfs_attachment
-sysctl_attachment
-udev_attachment
 __input__
 input/keyboard
 input/mouse

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-10 20:34:37 +0000
+++ debian/changelog	2012-09-11 14:01:19 +0000
@@ -44,6 +44,8 @@
   * scripts/touchpad_scroll_resource: Added support for systems without
     a touchpad (LP #1045066)
   * patch/0.14.2: Fixed patch to rmtree instead of rmdir scripts directory.
+  * debian/checkbox.templates, debian/checkbox.config: Added support to
+    preseed properties in environment_info plugin.
 
   [Sean Feole]
   * [FEATURE] scripts/battery_test: measures battery capacity before and after

=== modified file 'debian/checkbox.config'
--- debian/checkbox.config	2012-07-12 19:05:30 +0000
+++ debian/checkbox.config	2012-09-11 14:01:19 +0000
@@ -10,6 +10,15 @@
         db_input medium checkbox/plugins/launchpad_prompt/email || true
         db_input medium checkbox/plugins/proxy_info/http_proxy || true
         db_input medium checkbox/plugins/proxy_info/https_proxy || true
+        db_input medium checkbox/plugins/environment_info/routers || true
+        db_input medium checkbox/plugins/environment_info/router_ssid || true
+        db_input medium checkbox/plugins/environment_info/router_psk || true
+        db_input medium checkbox/plugins/environment_info/wpa_bg_ssid || true
+        db_input medium checkbox/plugins/environment_info/wpa_bg_psk || true
+        db_input medium checkbox/plugins/environment_info/wpa_n_ssid || true
+        db_input medium checkbox/plugins/environment_info/wpa_n_psk || true
+        db_input medium checkbox/plugins/environment_info/open_bg_ssid || true
+        db_input medium checkbox/plugins/environment_info/open_n_ssid || true
         db_go
         ;;
     *)

=== modified file 'debian/checkbox.templates'
--- debian/checkbox.templates	2012-07-12 19:05:30 +0000
+++ debian/checkbox.templates	2012-09-11 14:01:19 +0000
@@ -28,3 +28,50 @@
 Type: string
 _Description: HTTPS Proxy:
  HTTPS proxy to use instead of the one specified in environment.
+
+Template: checkbox/plugins/environment_info/routers
+Type: select
+Choices: single, multiple
+Default: single
+_Description: Routers:
+ Whether there is a single router or multiple routers.
+
+Template: checkbox/plugins/environment_info/router_ssid
+Type: string
+_Description: Router SSID:
+ The SSID of the single wireless router.
+
+Template: checkbox/plugins/environment_info/router_psk
+Type: string
+_Description: Router PSK:
+ The PSK of the single wireless router.
+
+Template: checkbox/plugins/environment_info/wpa_bg_ssid
+Type: string
+_Description: WPA BG SSID:
+ The SSID of the 802.11b/g router with WPA security.
+
+Template: checkbox/plugins/environment_info/wpa_bg_psk
+Type: string
+_Description: WPA BG PSK:
+ The PSK of the 802.11b/g router with WPA security.
+
+Template: checkbox/plugins/environment_info/wpa_n_ssid
+Type: string
+_Description: WPA N SSID:
+ The SSID of the 802.11n router with WPA security.
+
+Template: checkbox/plugins/environment_info/wpa_n_psk
+Type: string
+_Description: WPA N PSK:
+ The PSK of the 802.11n router with WPA security.
+
+Template: checkbox/plugins/environment_info/open_bg_ssid
+Type: string
+_Description: Open BG SSID:
+ The SSID of the 802.11b/g router with open security.
+
+Template: checkbox/plugins/environment_info/open_n_ssid
+Type: string
+_Description: Open N SSID:
+ The PSK of the 802.11n router with open security.