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/luks.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'archinstall/lib/luks.py') diff --git a/archinstall/lib/luks.py b/archinstall/lib/luks.py index e61fd43b..710af01e 100644 --- a/archinstall/lib/luks.py +++ b/archinstall/lib/luks.py @@ -15,6 +15,7 @@ from .general import SysCommand, SysCommandWorker from .output import log from .exceptions import SysCallError, DiskError from .storage import storage +from .disk.mapperdev import MapperDev class luks2: 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') if os.path.islink(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 def close(self, mountpoint :Optional[str] = None) -> bool: -- cgit v1.2.3-70-g09d2