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

More error handling to encrypted vs not encrypted partitions.

This commit is contained in:
Anton Hvornum 2021-03-14 15:32:22 +01:00
parent 502968b579
commit 32ab44e6da
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/guided.py
View File

@ -248,8 +248,11 @@ def perform_installation_steps():
# which ones are safe to format, and format those.
for partition in archinstall.arguments['harddrive']:
if partition.safe_to_format():
if partition.encrypted:
partition.encrypt(password=archinstall.arguments.get('!encryption-password', None))
# Partition might be marked as encrypted due to the filesystem type crypt_LUKS
# But we might have omitted the encryption password question to skip encryption.
# In which case partition.encrypted will be true, but passwd will be false.
if partition.encrypted and passwd := archinstall.arguments.get('!encryption-password', None):
partition.encrypt(password=passwd)
else:
partition.format()
else: