Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/luks.py
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2022-04-29 11:12:24 +0200
committerGitHub <noreply@github.com>2022-04-29 11:12:24 +0200
commitfb76f46b774b11c8d501ba82617e1d6ff11ef2eb (patch)
tree77d68185c7d51c636d6460eb894273da47ec2622 /archinstall/lib/luks.py
parentfc08aeef4e3f6ea7bd2f744217b8f2dee9b60c82 (diff)
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)
Diffstat (limited to 'archinstall/lib/luks.py')
-rw-r--r--archinstall/lib/luks.py10
1 files changed, 9 insertions, 1 deletions
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: