From d57b08ec6f8f5d7b267b547e8de4457061698578 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sat, 14 Jul 2018 21:17:32 -0600
Subject: [PATCH] Update hw_diags so it can be used by wk-ddrescue

---
 .bin/Scripts/functions/hw_diags.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 63942ed2..1b61d8ca 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -588,19 +588,21 @@ def scan_disks():
     TESTS['NVMe/SMART']['Devices'] = devs
     TESTS['badblocks']['Devices'] = devs
     TESTS['iobenchmark']['Devices'] = devs
+    return devs
 
-def show_disk_details(dev):
+def show_disk_details(dev, only_attributes=False):
     """Display disk details."""
     dev_name = dev['lsblk']['name']
-    # Device description
-    print_info('Device: /dev/{}'.format(dev['lsblk']['name']))
-    print_standard(' {:>4} ({}) {} {}'.format(
-        str(dev['lsblk'].get('size', '???b')).strip(),
-        str(dev['lsblk'].get('tran', '???')).strip().upper().replace(
-            'NVME', 'NVMe'),
-        str(dev['lsblk'].get('model', 'Unknown Model')).strip(),
-        str(dev['lsblk'].get('serial', 'Unknown Serial')).strip(),
-        ))
+    if not only_attributes:
+      # Device description
+      print_info('Device: /dev/{}'.format(dev['lsblk']['name']))
+      print_standard(' {:>4} ({}) {} {}'.format(
+          str(dev['lsblk'].get('size', '???b')).strip(),
+          str(dev['lsblk'].get('tran', '???')).strip().upper().replace(
+              'NVME', 'NVMe'),
+          str(dev['lsblk'].get('model', 'Unknown Model')).strip(),
+          str(dev['lsblk'].get('serial', 'Unknown Serial')).strip(),
+          ))
 
     # Warnings
     if dev.get('NVMe Disk', False):