From 6014a8fb70275d7be2b8b6a7f6c548b7ae718161 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Tue, 4 Dec 2018 16:18:45 -0700 Subject: [PATCH] Don't add WK or loopback devices --- .bin/Scripts/functions/hw_diags.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py index 5bb03c9b..8f543aa5 100644 --- a/.bin/Scripts/functions/hw_diags.py +++ b/.bin/Scripts/functions/hw_diags.py @@ -171,7 +171,22 @@ class State(): result = run_program(cmd, check=False) json_data = json.loads(result.stdout.decode()) for dev in json_data['blockdevices']: - self.devs.append(DevObj(dev['name'])) + skip_dev = False + dev_obj = DevObj(dev['name']) + + # Skip loopback devices + if dev_obj.lsblk['tran'] == 'NONE': + skip_dev = True + + # Skip WK devices + wk_label_regex = r'{}_(LINUX|UFD)'.format(KIT_NAME_SHORT) + for label in dev_obj.labels: + if re.search(wk_label_regex, label, re.IGNORECASE): + skip_dev = True + + # Add device + if not skip_dev: + self.devs.append(DevObj(dev['name'])) # Functions def generate_horizontal_graph(rates, oneline=False):