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

Moved everything into a function block rather than having everything on a line by line situation. This just helps separate what the two major components/blocks are of the guided profile. The change was done in the previous commit, but a spelling mistake was made here and I forgot to mention it in the already long commit log. But user-questions is now in one function. Installation steps are now in a two-tier function, one for setup and one for install steps.

This commit is contained in:
Anton Hvornum 2021-03-09 16:13:21 +01:00
parent aafe3d19c6
commit 2bd220c280
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
examples/guided.py
View File

@ -60,15 +60,21 @@ def perform_installation(device, boot_partition, language, mirrors):
installation.install_profile(profile) installation.install_profile(profile)
if archinstall.arguments.get('users', None): if archinstall.arguments.get('users', None):
for user, password in archinstall.arguments.get('users').items(): for user in archinstall.arguments.get('users'):
password = users[user]
installation.user_create(user, password, sudo=False) installation.user_create(user, password, sudo=False)
if archinstall.arguments.get('superusers', None): if archinstall.arguments.get('superusers', None):
for user, password in archinstall.arguments.get('superusers').items(): for user in archinstall.arguments.get('users'):
installation.user_create(user, password, sudo=True) password = users[user]
installation.user_create(user, password, sudo=Tru)
if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw): # sudo = False
installation.user_set_pw('root', root_pw) # if 'root_pw' not in archinstall.storage['_guided_hidden'] or len(archinstall.storage['_guided_hidden']['root_pw'].strip()) == 0:
# sudo = True
if 'root_pw' in archinstall.storage['_guided_hidden'] and archinstall.storage['_guided_hidden']['root_pw']:
installation.user_set_pw('root', archinstall.storage['_guided_hidden']['root_pw'])
def ask_user_questions(): def ask_user_questions():
""" """
@ -322,4 +328,4 @@ def perform_installation_steps():
mirrors=archinstall.arguments['mirror-region']) mirrors=archinstall.arguments['mirror-region'])
ask_user_questions() ask_user_questions()
perform_pre_installation_steps() perform_installation_steps()