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

Make the style of the word superuser consistent

This commit is contained in:
Dylan M. Taylor 2021-04-30 22:42:08 -04:00 committed by GitHub
parent feae13ac84
commit 4efa01c4fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archinstall/lib/user_interaction.py
View File

@ -263,14 +263,14 @@ class MiniCurses():
if response: if response:
return response return response
def ask_for_superuser_account(prompt='Username for required super-user with sudo privileges: ', forced=False): def ask_for_superuser_account(prompt='Username for required superuser with sudo privileges: ', forced=False):
while 1: while 1:
new_user = input(prompt).strip(' ') new_user = input(prompt).strip(' ')
if not new_user and forced: if not new_user and forced:
# TODO: make this text more generic? # TODO: make this text more generic?
# It's only used to create the first sudo user when root is disabled in guided.py # It's only used to create the first sudo user when root is disabled in guided.py
log(' * Since root is disabled, you need to create a least one (super) user!', fg='red') log(' * Since root is disabled, you need to create a least one superuser!', fg='red')
continue continue
elif not new_user and not forced: elif not new_user and not forced:
raise UserError("No superuser was created.") raise UserError("No superuser was created.")
@ -282,7 +282,7 @@ def ask_for_superuser_account(prompt='Username for required super-user with sudo
def ask_for_additional_users(prompt='Any additional users to install (leave blank for no users): '): def ask_for_additional_users(prompt='Any additional users to install (leave blank for no users): '):
users = {} users = {}
super_users = {} superusers = {}
while 1: while 1:
new_user = input(prompt).strip(' ') new_user = input(prompt).strip(' ')
@ -293,11 +293,11 @@ def ask_for_additional_users(prompt='Any additional users to install (leave blan
password = get_password(prompt=f'Password for user {new_user}: ') password = get_password(prompt=f'Password for user {new_user}: ')
if input("Should this user be a superuser (sudoer) [y/N]: ").strip(' ').lower() in ('y', 'yes'): if input("Should this user be a superuser (sudoer) [y/N]: ").strip(' ').lower() in ('y', 'yes'):
super_users[new_user] = {"!password" : password} superusers[new_user] = {"!password" : password}
else: else:
users[new_user] = {"!password" : password} users[new_user] = {"!password" : password}
return users, super_users return users, superusers
def ask_for_a_timezone(): def ask_for_a_timezone():
while True: while True: