diff options
| author | Jonathan Cave <jonathan.cave@canonical.com> | 2020-08-05 23:30:28 +0100 |
|---|---|---|
| committer | Jonathan Cave <jonathan.cave@canonical.com> | 2020-08-05 23:30:28 +0100 |
| commit | d527f39fae8167512d40adc9acc57224ce037863 (patch) | |
| tree | 73cc57aaee8047d8325a0714fd8ac5a8b1d0c5fd /units/info | |
| parent | b241956a7c3e0a078d49d2d85d2224eca66ba31a (diff) | |
units/*: simplify requires fields
Improve performance of checkbox by reducing the complexity of requires fields.
Diffstat (limited to 'units/info')
| -rw-r--r-- | units/info/jobs.pxu | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu index 286dcb0..a9031ad 100644 --- a/units/info/jobs.pxu +++ b/units/info/jobs.pxu @@ -43,7 +43,7 @@ id: dmidecode_attachment plugin: attachment category_id: com.canonical.plainbox::info requires: - package.name == 'dmidecode' or executable.name == 'dmidecode' + executable.name == 'dmidecode' dmi_present.state == 'supported' user: root command: dmidecode | iconv -t 'utf-8' -c @@ -54,7 +54,7 @@ _summary: Attach output of dmidecode id: lshw_attachment plugin: attachment category_id: com.canonical.plainbox::info -requires: package.name == 'lshw' or executable.name == 'lshw' +requires: executable.name == 'lshw' user: root command: lshw | iconv -t 'utf-8' -c _summary: Attach lshw output @@ -197,7 +197,7 @@ estimated_duration: 0.1 plugin: attachment command: lsblk -i -n -P -o KNAME,TYPE,MOUNTPOINT requires: - package.name == "util-linux" or executable.name == 'lsblk' + executable.name == 'lsblk' _description: Attaches disk block devices mount points _summary: Attach info block devices and their mount points @@ -252,7 +252,7 @@ category_id: com.canonical.plainbox::info id: info/hdparm_{name}.txt estimated_duration: 1.0 requires: - package.name == 'hdparm' or executable.name == 'hdparm' + executable.name == 'hdparm' block_device.state != 'removable' and block_device.name == '{name}' user: root command: hdparm -I /dev/{name} @@ -446,7 +446,7 @@ plugin: attachment category_id: com.canonical.plainbox::info command: lstopo -v estimated_duration: 0.015 -requires: package.name == 'hwloc' or executable.name == 'lstopo' +requires: executable.name == 'lstopo' _description: Attaches the system topology as presented by the lstopo command _summary: Attach the output of lstopo @@ -454,7 +454,7 @@ id: lstopo_visual_attachment plugin: attachment category_id: com.canonical.plainbox::info estimated_duration: 0.015 -requires: package.name == 'hwloc' or executable.name == 'lstopo' +requires: executable.name == 'lstopo' _description: Attaches the system topology as presented by the lstopo command _summary: Attach the output of lstopo command: |