Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-01-25 00:09:34 +0100
committerAnton Hvornum <anton@hvornum.se>2021-01-25 00:09:34 +0100
commit435d2f687eda1548e56270787b11f024e2a8e08d (patch)
treea3f21df670cc7450c2a91ac26b71229860578664 /examples
parent9a94a632bfdcbc71b19ee23055296ad7e43987fa (diff)
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.
Diffstat (limited to 'examples')
-rw-r--r--examples/guided.py5
1 files changed, 5 insertions, 0 deletions
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)