Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-04-08 19:56:29 +0200
committerAnton Hvornum <anton@hvornum.se>2021-04-08 19:56:29 +0200
commitae2da06075763d388c303e8cd7914694454aa8fb (patch)
tree9352b90a29a93b285292b526c2197c6e69117879 /archinstall
parentc5d099c3fa95cc32e49ffab30a722e071e874362 (diff)
Added a safety check to verify that the encrypted partition exists at least before trying to open it.
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/lib/luks.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/archinstall/lib/luks.py b/archinstall/lib/luks.py
index a1d42196..b076ac9b 100644
--- a/archinstall/lib/luks.py
+++ b/archinstall/lib/luks.py
@@ -1,5 +1,7 @@
import os
import shlex
+import time
+import pathlib
from .exceptions import *
from .general import *
from .disk import Partition
@@ -123,6 +125,11 @@ class luks2():
from .disk import get_filesystem_type
if '/' in mountpoint:
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')
if os.path.islink(f'/dev/mapper/{mountpoint}'):
self.mapdev = f'/dev/mapper/{mountpoint}'