From 435d2f687eda1548e56270787b11f024e2a8e08d Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Mon, 25 Jan 2021 00:09:34 +0100 Subject: Added some more fields to the configuration output, as well as added a better fail safe for the logging output. Any exception during the installation will be caught by __exit__ in Installer(), hopefully. --- examples/guided.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'examples') diff --git a/examples/guided.py b/examples/guided.py index 7726d5b9..f6c80969 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -85,6 +85,7 @@ archinstall.sys_command(f'cryptsetup close /dev/mapper/luksloop', suppress_error if len(keyboard_language := archinstall.select_language(archinstall.list_keyboard_languages()).strip()): archinstall.set_keyboard_language(keyboard_language) + archinstall.storage['_guided']['keyboard_layout'] = keyboard_language # Create a storage structure for all our information. # We'll print this right before the user gets informed about the formatting timer. @@ -102,6 +103,7 @@ while (disk_password := getpass.getpass(prompt='Enter disk encryption password ( if disk_password != disk_password_verification: archinstall.log(' * Passwords did not match * ', bg='black', fg='red') continue + archinstall.storage['_guided']['disk_encryption'] = True break archinstall.storage['_guided']['harddrive'] = harddrive @@ -118,7 +120,10 @@ while (root_pw := getpass.getpass(prompt='Enter root password (leave blank to le archinstall.log(' * Passwords did not match * ', bg='black', fg='red') continue + # Storing things in _guided_hidden helps us avoid printing it + # when echoing user configuration: archinstall.storage['_guided'] archinstall.storage['_guided_hidden']['root_pw'] = root_pw + archinstall.storage['_guided']['root_unlocked'] = True break # Ask for additional users (super-user if root pw was not set) -- cgit v1.2.3-70-g09d2