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

Added a partition.umount() and a check when running cryptsetup if the disk is in use.

This commit is contained in:
Anton Hvornum 2021-03-14 12:13:08 +01:00
parent 5483b218fd
commit 577428f1b2
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archinstall/lib/disk.py
View File

@ -312,6 +312,11 @@ class Partition():
self.mountpoint = target
return True
def unmount(self):
if sys_command(f'/usr/bin/umount {self.path}').exit_code == 0:
self.mountpoint = None
return True
def filesystem_supported(self):
"""
The support for a filesystem (this partition) is tested by calling

10
archinstall/lib/luks.py
View File

@ -64,8 +64,14 @@ class luks2():
with open(key_file, 'wb') as fh:
fh.write(password)
o = b''.join(sys_command(f'/usr/bin/cryptsetup -q -v --type luks2 --pbkdf argon2i --hash {hash_type} --key-size {key_size} --iter-time {iter_time} --key-file {os.path.abspath(key_file)} --use-urandom luksFormat {partition.path}'))
if b'Command successful.' not in o:
cmd_handle = sys_command(f'/usr/bin/cryptsetup -q -v --type luks2 --pbkdf argon2i --hash {hash_type} --key-size {key_size} --iter-time {iter_time} --key-file {os.path.abspath(key_file)} --use-urandom luksFormat {partition.path}')
if cmd_handle.exit_code == 256:
# Partition was in use, unmount it and
partition.unmount()
sys_command(f'cryptsetup close {partition.path}')
cmd_handle = sys_command(f'/usr/bin/cryptsetup -q -v --type luks2 --pbkdf argon2i --hash {hash_type} --key-size {key_size} --iter-time {iter_time} --key-file {os.path.abspath(key_file)} --use-urandom luksFormat {partition.path}')
if b'Command successful.' not in b''.join(cmd_handle):
raise DiskError(f'Could not encrypt volume "{partition.path}": {o}')
return key_file