| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/lib/disk/filesystem.py | 8 |
diff --git a/archinstall/lib/disk/filesystem.py b/archinstall/lib/disk/filesystem.py index 3b09ec6c..3aa09b15 100644 --- a/archinstall/lib/disk/filesystem.py +++ b/archinstall/lib/disk/filesystem.py @@ -45,12 +45,14 @@ class Filesystem: self.partprobe() time.sleep(5) - # TODO: Convert to blkid (or something similar, but blkid doesn't support traversing to list sub-PARTUUIDs based on blockdevice path?) - output = json.loads(SysCommand(f"lsblk --json -o+PARTUUID {self.blockdevice.device}").decode('UTF-8')) + # We'll use unreliable lbslk to grab children under the /dev/<device> + output = json.loads(SysCommand(f"lsblk --json {self.blockdevice.device}").decode('UTF-8')) for device in output['blockdevices']: for index, partition in enumerate(device['children']): - if (partuuid := partition.get('partuuid', None)) and partuuid.lower() == uuid: + # But we'll use blkid to reliably grab the PARTUUID for that child device (partition) + partition_uuid = SysCommand(f"blkid -s PARTUUID -o value /dev/{partition.get('name')}").decode().strip() + if partition_uuid.lower() == uuid.lower(): return index time.sleep(storage['DISK_TIMEOUTS']) |