Merged PR #713 - Fixes #712

Removed assumptions that !user and !super-users exists.
This commit is contained in:
Anton Hvornum 2021-11-11 18:00:37 +00:00 committed by GitHub
commit 9b944b90b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -243,13 +243,13 @@ def perform_filesystem_operations():
fs.load_layout(archinstall.storage['disk_layouts'][drive.path])
def perform_installation(mountpoint):
user_credentials = {
"!users" : archinstall.arguments['!users'],
"!superusers" : archinstall.arguments['!superusers'],
"!root-password" : archinstall.arguments['!root-password'],
}
user_credentials = {}
if archinstall.arguments.get('!users'):
user_credentials["!users"] = archinstall.arguments['!users']
if archinstall.arguments.get('!superusers'):
user_credentials["!superusers"] = archinstall.arguments['!superusers']
if archinstall.arguments.get('!encryption-password'):
user_credentials["!encryption-password"] = archinstall.arguments.get('!encryption-password')
user_credentials["!encryption-password"] = archinstall.arguments['!encryption-password']
with open("/var/log/archinstall/user_credentials.json", "w") as config_file:
config_file.write(json.dumps(user_credentials, indent=4, sort_keys=True, cls=archinstall.UNSAFE_JSON))