Merge ~sylvain-pineau/plainbox-provider-checkbox:executable_res_wireless into plainbox-provider-checkbox:master

[Sylvain Pineau]

More classic fixes to rely on the executable resource job, this time to fix two wireless jobs

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

diff --git a/bin/disk_info b/bin/disk_info
index 5efedbd..0b45443 100755
--- a/bin/disk_info
+++ b/bin/disk_info
@@ -53,7 +53,7 @@ def main():
     disks = 0
     for line in lsblk.splitlines():
         m = pattern.match(line)
-        if not m or m.group('TYPE') != 'disk':
+        if not m or m.group('TYPE') not in ('disk', 'crypt'):
             continue
         # Only consider MMC block devices if one of their mounted partitions is
         # root (/)
diff --git a/units/wireless/jobs.pxu b/units/wireless/jobs.pxu
index 363984a..52b2b01 100644
--- a/units/wireless/jobs.pxu
+++ b/units/wireless/jobs.pxu
@@ -389,7 +389,7 @@ plugin: shell
 category_id: com.canonical.plainbox::wireless
 id: wireless/monitor_wireless_connection
 requires:
- package.name == 'iperf'
+ executable.name == 'iperf'
  device.category == 'WIRELESS'
 user: root
 environ: WPA_BG_SSID WPA_BG_PSK SERVER_IPERF
@@ -418,7 +418,7 @@ plugin: shell
 category_id: com.canonical.plainbox::wireless
 id: wireless/monitor_wireless_connection_udp
 requires:
- package.name == 'iperf'
+ executable.name == 'iperf'
  device.category == 'WIRELESS'
 user: root
 environ: WPA_BG_SSID WPA_BG_PSK SERVER_IPERF