From b187caa7e59999e9f949ecb2f0312939e8094d26 Mon Sep 17 00:00:00 2001
From: Sylvain Pineau <sylvain.pineau@canonical.com>
Date: Thu, 26 Sep 2019 20:35:12 +0200
Subject: submission: Expose the full set of DMI devices in raw-devices-dmi
 attachment

Fixes: lp:1839667
---
 units/submission/jobs.pxu | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'units')

diff --git a/units/submission/jobs.pxu b/units/submission/jobs.pxu
index a2f5382..b433fd3 100644
--- a/units/submission/jobs.pxu
+++ b/units/submission/jobs.pxu
@@ -22,10 +22,8 @@ requires:
  dmi_present.state == 'supported'
 user: root
 command:
- dmidecode -t bios -t system | python3 -m plainbox dev parse dmidecode | \
- jq '[.[0]._attributes +
-     {"category": .[0].category}, .[1]._attributes +
-     {"category": .[1].category}]'
+ dmidecode | python3 -m plainbox dev parse dmidecode | \
+ jq '[.[] | ._attributes + {"category": .category}]'
 estimated_duration: 1
 _description: Attaches dmidecode output
 _summary: Attaches json dumps of udev_resource raw dmi devices
-- 
cgit v1.2.3