From 32ab44e6dab9c2374fa65a1d76af5ab0fa746ce6 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 14 Mar 2021 15:32:22 +0100 Subject: More error handling to encrypted vs not encrypted partitions. --- examples/guided.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/guided.py b/examples/guided.py index 96243a1b..cf3610a1 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -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: -- cgit v1.2.3-54-g00ecf