From 502968b579160b4df9f5cbd66c8f6e96c2f8d2b4 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 14 Mar 2021 15:28:46 +0100 Subject: Added some error handling to disk encryption passwords. --- examples/guided.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'examples/guided.py') diff --git a/examples/guided.py b/examples/guided.py index 40ac7ca8..96243a1b 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -94,7 +94,7 @@ def ask_user_questions(): old_password = archinstall.arguments.get('!encryption-password', None) if not old_password: old_password = input(f'Enter the old encryption password for {partition}: ') - + if (autodetected_filesystem := partition.detect_inner_filesystem(old_password)): new_filesystem = autodetected_filesystem else: @@ -134,8 +134,9 @@ def ask_user_questions(): # Get disk encryption password (or skip if blank) if not archinstall.arguments.get('!encryption-password', None): - archinstall.arguments['!encryption-password'] = archinstall.get_password(prompt='Enter disk encryption password (leave blank for no encryption): ') - archinstall.arguments['harddrive'].encryption_password = archinstall.arguments['!encryption-password'] + if passwd := archinstall.get_password(prompt='Enter disk encryption password (leave blank for no encryption): '): + archinstall.arguments['!encryption-password'] = passwd + archinstall.arguments['harddrive'].encryption_password = archinstall.arguments['!encryption-password'] # Get the hostname for the machine if not archinstall.arguments.get('hostname', None): -- cgit v1.2.3-70-g09d2