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

Added a safety check to verify that the encrypted partition exists at least before trying to open it.

This commit is contained in:
Anton Hvornum 2021-04-08 19:56:29 +02:00
parent c5d099c3fa
commit ae2da06075
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archinstall/lib/luks.py
View File

@ -1,5 +1,7 @@
import os import os
import shlex import shlex
import time
import pathlib
from .exceptions import * from .exceptions import *
from .general import * from .general import *
from .disk import Partition from .disk import Partition
@ -123,6 +125,11 @@ class luks2():
from .disk import get_filesystem_type from .disk import get_filesystem_type
if '/' in mountpoint: if '/' in mountpoint:
os.path.basename(mountpoint) # TODO: Raise exception instead? os.path.basename(mountpoint) # TODO: Raise exception instead?
wait_timer = time.time()
while pathlib.Paht(partition.path).exists() is False and time.time() - wait_timer < 10:
time.sleep(0.025)
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.mapdev = f'/dev/mapper/{mountpoint}' self.mapdev = f'/dev/mapper/{mountpoint}'