From fd904ca787b5add3c2394f04eec1cc3914b64aff Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Thu, 11 Nov 2021 14:51:57 +0000 Subject: Improved partition.uuid handling of lsblk information --- archinstall/lib/disk/partition.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/archinstall/lib/disk/partition.py b/archinstall/lib/disk/partition.py index e9688965..b5c252a4 100644 --- a/archinstall/lib/disk/partition.py +++ b/archinstall/lib/disk/partition.py @@ -145,8 +145,11 @@ class Partition: it doesn't seam to be able to detect md raid partitions. """ - lsblk = json.loads(SysCommand(f'lsblk -J -o+PARTUUID {self.path}').decode('UTF-8')) - for partition in lsblk['blockdevices']: + partuuid_struct = SysCommand(f'lsblk -J -o+PARTUUID {self.path}') + if not partuuid_struct.exit_code == 0: + raise DiskError(f"Could not get PARTUUID for {self.path}: {partuuid_struct}") + + for partition in json.loads(partuuid_struct.decode('UTF-8'))['blockdevices']: return partition.get('partuuid', None) return None -- cgit v1.2.3-54-g00ecf