From a66c27be84a002f44fe91ebebb9a9cdc6966741e Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Thu, 30 Jan 2020 14:01:30 -0700 Subject: [PATCH] Updated get_disk_details_macos() --- scripts/wk/hw/obj.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/wk/hw/obj.py b/scripts/wk/hw/obj.py index dc6175ea..0c33296e 100644 --- a/scripts/wk/hw/obj.py +++ b/scripts/wk/hw/obj.py @@ -656,12 +656,15 @@ def get_disk_details_macos(path): dev['label'] = dev.pop('VolumeName', '') dev['model'] = dev.pop('MediaName', 'Unknown') dev['mountpoint'] = dev.pop('MountPoint', '') + dev['name'] = dev.get('name', str(dev['path'])) dev['phy-sec'] = dev.pop('DeviceBlockSize', 512) dev['serial'] = get_disk_serial_macos(dev['path']) dev['size'] = dev.pop('Size', -1) dev['ssd'] = dev.pop('SolidState', False) dev['vendor'] = '' - if not dev.get('WholeDisk', True): + if dev.get('WholeDisk', True): + dev['parent'] = None + else: dev['parent'] = dev.pop('ParentWholeDisk', None) # Done