From fb76f46b774b11c8d501ba82617e1d6ff11ef2eb Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Fri, 29 Apr 2022 11:12:24 +0200 Subject: unlocked luks2 partitions were missing a BlockDevice parameter. It's technically not the true block device, as the mapper dev belongs to a partition, but in this context blockdev means the harddrive/medium that the partition (unlocked or otherwise) lives on. (#1100) --- archinstall/lib/disk/blockdevice.py | 2 +- archinstall/lib/disk/helpers.py | 2 +- archinstall/lib/disk/mapperdev.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'archinstall/lib/disk') diff --git a/archinstall/lib/disk/blockdevice.py b/archinstall/lib/disk/blockdevice.py index 16ba0160..206c3b7e 100644 --- a/archinstall/lib/disk/blockdevice.py +++ b/archinstall/lib/disk/blockdevice.py @@ -141,7 +141,7 @@ class BlockDevice: if part_id not in self.part_cache: # TODO: Force over-write even if in cache? if part_id not in self.part_cache or self.part_cache[part_id].size != part['size']: - self.part_cache[part_id] = Partition(root_path + part_id, self, part_id=part_id) + self.part_cache[part_id] = Partition(root_path + part_id, block_device=self, part_id=part_id) return {k: self.part_cache[k] for k in sorted(self.part_cache)} diff --git a/archinstall/lib/disk/helpers.py b/archinstall/lib/disk/helpers.py index f9618b6c..0799cd49 100644 --- a/archinstall/lib/disk/helpers.py +++ b/archinstall/lib/disk/helpers.py @@ -241,7 +241,7 @@ def all_blockdevices(mappers=False, partitions=False, error=False) -> Dict[str, instances[path] = DMCryptDev(dev_path=path) elif path_info.get('PARTUUID') or path_info.get('PART_ENTRY_NUMBER'): if partitions: - instances[path] = Partition(path, BlockDevice(get_parent_of_partition(pathlib.Path(path)))) + instances[path] = Partition(path, block_device=BlockDevice(get_parent_of_partition(pathlib.Path(path)))) elif path_info.get('PTTYPE', False) is not False or path_info.get('TYPE') == 'loop': instances[path] = BlockDevice(path, path_info) elif path_info.get('TYPE') == 'squashfs': diff --git a/archinstall/lib/disk/mapperdev.py b/archinstall/lib/disk/mapperdev.py index 91ec6d25..32e3ac9b 100644 --- a/archinstall/lib/disk/mapperdev.py +++ b/archinstall/lib/disk/mapperdev.py @@ -46,7 +46,7 @@ class MapperDev: information = uevent(uevent_data) block_device = BlockDevice(get_parent_of_partition('/dev/' / pathlib.Path(information['DEVNAME']))) - return Partition(information['DEVNAME'], block_device) + return Partition(information['DEVNAME'], block_device=block_device) raise ValueError(f"Could not convert {self.mappername} to a real dm-crypt device") -- cgit v1.2.3-54-g00ecf