RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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)

This commit is contained in:
Anton Hvornum 2022-04-29 11:12:24 +02:00 committed by GitHub
parent fc08aeef4e
commit fb76f46b77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archinstall/lib/disk/blockdevice.py
View File

@ -141,7 +141,7 @@ class BlockDevice:
if part_id not in self.part_cache: if part_id not in self.part_cache:
# TODO: Force over-write even if in 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']: 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)} return {k: self.part_cache[k] for k in sorted(self.part_cache)}

2
archinstall/lib/disk/helpers.py
View File

@ -241,7 +241,7 @@ def all_blockdevices(mappers=False, partitions=False, error=False) -> Dict[str,
instances[path] = DMCryptDev(dev_path=path) instances[path] = DMCryptDev(dev_path=path)
elif path_info.get('PARTUUID') or path_info.get('PART_ENTRY_NUMBER'): elif path_info.get('PARTUUID') or path_info.get('PART_ENTRY_NUMBER'):
if partitions: 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': elif path_info.get('PTTYPE', False) is not False or path_info.get('TYPE') == 'loop':
instances[path] = BlockDevice(path, path_info) instances[path] = BlockDevice(path, path_info)
elif path_info.get('TYPE') == 'squashfs': elif path_info.get('TYPE') == 'squashfs':

2
archinstall/lib/disk/mapperdev.py
View File

@ -46,7 +46,7 @@ class MapperDev:
information = uevent(uevent_data) information = uevent(uevent_data)
block_device = BlockDevice(get_parent_of_partition('/dev/' / pathlib.Path(information['DEVNAME']))) 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") raise ValueError(f"Could not convert {self.mappername} to a real dm-crypt device")

10
archinstall/lib/luks.py
View File

@ -15,6 +15,7 @@ from .general import SysCommand, SysCommandWorker
from .output import log from .output import log
from .exceptions import SysCallError, DiskError from .exceptions import SysCallError, DiskError
from .storage import storage from .storage import storage
from .disk.mapperdev import MapperDev
class luks2: class luks2:
def __init__(self, def __init__(self,
@ -160,7 +161,14 @@ class luks2:
SysCommand(f'/usr/bin/cryptsetup open {partition.path} {mountpoint} --key-file {os.path.abspath(key_file)} --type luks2') SysCommand(f'/usr/bin/cryptsetup open {partition.path} {mountpoint} --key-file {os.path.abspath(key_file)} --type luks2')
if os.path.islink(f'/dev/mapper/{mountpoint}'): if os.path.islink(f'/dev/mapper/{mountpoint}'):
self.mapdev = f'/dev/mapper/{mountpoint}' self.mapdev = f'/dev/mapper/{mountpoint}'
unlocked_partition = Partition(self.mapdev, None, encrypted=True, filesystem=get_filesystem_type(self.mapdev), autodetect_filesystem=False)
unlocked_partition = Partition(
self.mapdev,
block_device=MapperDev(mountpoint).partition.block_device,
encrypted=True,
filesystem=get_filesystem_type(self.mapdev),
autodetect_filesystem=False
)
return unlocked_partition return unlocked_partition
def close(self, mountpoint :Optional[str] = None) -> bool: def close(self, mountpoint :Optional[str] = None) -> bool: