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

Merge pull request #699 from dylanmtaylor/patch-2 

Fix luks import so that encryption works correctly
This commit is contained in:
Anton Hvornum 2021-11-08 22:16:02 +00:00 committed by GitHub
parent 565464c72d e9e46f0dd7
commit 68a1e42cfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall/lib/disk/partition.py
View File

@ -173,7 +173,7 @@ class Partition:
def detect_inner_filesystem(self, password): def detect_inner_filesystem(self, password):
log(f'Trying to detect inner filesystem format on {self} (This might take a while)', level=logging.INFO) 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: try:
with luks2(self, storage.get('ENC_IDENTIFIER', 'ai') + 'loop', password, auto_unmount=True) as unlocked_device: 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. 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) handle = luks2(self, None, None)
return handle.encrypt(self, *args, **kwargs) return handle.encrypt(self, *args, **kwargs)
@ -274,7 +274,7 @@ class Partition:
self.filesystem = filesystem self.filesystem = filesystem
elif filesystem == 'crypto_LUKS': elif filesystem == 'crypto_LUKS':
# from .luks import luks2 # from ..luks import luks2
# encrypted_partition = luks2(self, None, None) # encrypted_partition = luks2(self, None, None)
# encrypted_partition.format(path) # encrypted_partition.format(path)
self.filesystem = filesystem self.filesystem = filesystem