RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected some spelling errors and wrong variables.

This commit is contained in:
Anton Hvornum 2021-03-14 14:00:52 +01:00
parent c897421e1d
commit 37b1e61828
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall/lib/user_interaction.py
View File

@ -31,7 +31,7 @@ def ask_for_superuser_account(prompt='Create a required super-user with sudo pri
raise UserError("No superuser was created.")
password = get_password(prompt=f'Password for user {new_user}: ')
return {new_user: password}
return {new_user: {"!password" : password}}
def ask_for_additional_users(prompt='Any additional users to install (leave blank for no users): '):
users = {}
@ -44,9 +44,9 @@ def ask_for_additional_users(prompt='Any additional users to install (leave blan
password = get_password(prompt=f'Password for user {new_user}: ')
if input("Should this user be a sudo (super) user (y/N): ").strip(' ').lower() in ('y', 'yes'):
super_users[new_user] = password
super_users[new_user] = {"!password" : password}
else:
users[new_user] = password
users[new_user] = {"!password" : password}
return users, super_users

14
examples/guided.py
View File

@ -308,15 +308,11 @@ def perform_installation(device, boot_partition, language, mirrors):
if archinstall.arguments.get('profile', None):
installation.install_profile(archinstall.arguments.get('profile', None))
if archinstall.arguments.get('users', None):
for user in archinstall.arguments.get('users'):
password = users[user]
installation.user_create(user, password, sudo=False)
if archinstall.arguments.get('superusers', None):
for user in archinstall.arguments.get('users'):
password = users[user]
installation.user_create(user, password, sudo=Tru)
for user, user_info in archinstall.arguments.get('users', {}).items():
installation.user_create(user, user_info["!password"], sudo=False)
for superuser, user_info in archinstall.arguments.get('superusers', {}).items():
installation.user_create(superuser, user_info["!password"], sudo=True)
if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw):
installation.user_set_pw('root', root_pw)