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

Reverted some changes to SysCommandWorker()

This commit is contained in:
Anton Hvornum 2022-02-09 17:11:33 +01:00
parent b12346ac89
commit dce83ebe89
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
archinstall/lib/luks.py
View File

@ -105,13 +105,11 @@ class luks2:
# print(f"Looking for phrase: 'Enter passphrase for {partition.path}'")
cryptworker = SysCommandWorker(cryptsetup_args)
# print(f'Looking for: Enter passphrase for {partition.path}')
pw_given = False
while cryptworker.is_alive():
if bytes(f'Enter passphrase for {partition.path}', 'UTF-8') in cryptworker and pw_given is False:
# cryptworker.write(password)
# TODO: Workaround, as cryptsetup doesn't appear to accept any input via os.write(child_cd, data)
time.sleep(5)
print(password.decode())
cryptworker.write(password)
pw_given = True
if cryptworker.exit_code == 256:
@ -187,13 +185,11 @@ class luks2:
# print(f"Looking for phrase: 'Enter passphrase for {partition.path}'")
cryptworker = SysCommandWorker(f'/usr/bin/cryptsetup open {partition.path} {mountpoint} --type luks2')
# print(f'Looking for: Enter passphrase for {partition.path}')
pw_given = False
while cryptworker.is_alive():
if bytes(f'Enter passphrase for {partition.path}', 'UTF-8') in cryptworker and pw_given is False:
# cryptworker.write(password)
# TODO: Workaround, as cryptsetup doesn't appear to accept any input via os.write(child_cd, data)
time.sleep(5)
print(password.decode())
cryptworker.write(password)
pw_given = True
if not cryptworker.exit_code == 0: