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

Fixed luks2().close() to properly detect it's own mapped path

This commit is contained in:
Anton Hvornum 2021-03-09 12:00:40 +01:00
parent 251624734f
commit 3bf8ba0819
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archinstall/lib/luks.py
View File

@ -15,6 +15,7 @@ class luks2():
self.key_file = key_file self.key_file = key_file
self.auto_unmount = auto_unmount self.auto_unmount = auto_unmount
self.filesystem = 'crypto_LUKS' self.filesystem = 'crypto_LUKS'
self.mappoint = None
def __enter__(self): def __enter__(self):
#if self.partition.allow_formatting: #if self.partition.allow_formatting:
@ -82,14 +83,15 @@ class luks2():
os.path.basename(mountpoint) # TODO: Raise exception instead? os.path.basename(mountpoint) # TODO: Raise exception instead?
sys_command(f'/usr/bin/cryptsetup open {partition.path} {mountpoint} --key-file {os.path.abspath(key_file)} --type luks2') sys_command(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.mappoint = f'/dev/mapper/{mountpoint}'
return Partition(f'/dev/mapper/{mountpoint}', encrypted=True, filesystem=get_filesystem_type(f'/dev/mapper/{mountpoint}')) return Partition(f'/dev/mapper/{mountpoint}', encrypted=True, filesystem=get_filesystem_type(f'/dev/mapper/{mountpoint}'))
def close(self, mountpoint=None): def close(self, mountpoint=None):
if not mountpoint: if not mountpoint:
mountpoint = self.partition.path mountpoint = self.mappoint
sys_command(f'cryptsetup close /dev/mapper/{mountpoint}') sys_command(f'/usr/bin/cryptsetup close {self.mappoint}')
return os.path.islink(f'/dev/mapper/{mountpoint}') is False return os.path.islink(self.mappoint) is False
def format(self, path): def format(self, path):
if (handle := sys_command(f"/usr/bin/cryptsetup -q -v luksErase {path}")).exit_code != 0: if (handle := sys_command(f"/usr/bin/cryptsetup -q -v luksErase {path}")).exit_code != 0: