Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-11-08 22:16:02 +0000
committerGitHub <noreply@github.com>2021-11-08 22:16:02 +0000
commit68a1e42cfeed4c8986e7fb42330aefeb9a772710 (patch)
tree3ad3bc704b1150602ee098c34d8f1aac916e3bae
parent565464c72df713db7df94809a75b313aed3a7621 (diff)
parente9e46f0dd77b7cd27a78a59c371bd8b3bace5f3a (diff)
Merge pull request #699 from dylanmtaylor/patch-2
Fix luks import so that encryption works correctly
-rw-r--r--archinstall/lib/disk/partition.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/archinstall/lib/disk/partition.py b/archinstall/lib/disk/partition.py
index a459a820..e9688965 100644
--- a/archinstall/lib/disk/partition.py
+++ b/archinstall/lib/disk/partition.py
@@ -173,7 +173,7 @@ class Partition:
def detect_inner_filesystem(self, password):
log(f'Trying to detect inner filesystem format on {self} (This might take a while)', level=logging.INFO)
- from .luks import luks2
+ from ..luks import luks2
try:
with luks2(self, storage.get('ENC_IDENTIFIER', 'ai') + 'loop', password, auto_unmount=True) as unlocked_device:
@@ -206,7 +206,7 @@ class Partition:
"""
A wrapper function for luks2() instances and the .encrypt() method of that instance.
"""
- from .luks import luks2
+ from ..luks import luks2
handle = luks2(self, None, None)
return handle.encrypt(self, *args, **kwargs)
@@ -274,7 +274,7 @@ class Partition:
self.filesystem = filesystem
elif filesystem == 'crypto_LUKS':
- # from .luks import luks2
+ # from ..luks import luks2
# encrypted_partition = luks2(self, None, None)
# encrypted_partition.format(path)
self.filesystem = filesystem