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

Fixed an issue where --profile didn't override the network deploy.

This commit is contained in:
Anton Hvornum 2019-11-29 13:32:48 +01:00
parent 62ecb7ccfa
commit d84f4e2bf9
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
archinstall.py
View File

@ -1158,26 +1158,27 @@ if __name__ == '__main__':
args = setup_args_defaults(args) args = setup_args_defaults(args)
## == If we got networking, ## == If we got networking,
# Try fetching instructions for this box and execute them. # Try fetching instructions for this box unless a specific profile was given, and execute them.
instructions = load_automatic_instructions() if args['profile'] is None:
instructions = load_automatic_instructions()
if args['profile'] and not args['default']: elif args['profile'] and not args['default']:
instructions = get_instructions(args['profile']) instructions = get_instructions(args['profile'])
if len(instructions) <= 0: if len(instructions) <= 0:
print('[E] No instructions by the name of {} was found.'.format(args['profile'])) print('[E] No instructions by the name of {} was found.'.format(args['profile']))
print(' Installation won\'t continue until a valid profile is given.') print(' Installation won\'t continue until a valid profile is given.')
print(' (this is because --profile was given and a --default is not given)') print(' (this is because --profile was given and a --default is not given)')
exit(1) exit(1)
else:
first = True first = True
while not args['default'] and not args['profile'] and len(instructions) <= 0: while not args['default'] and not args['profile'] and len(instructions) <= 0:
profile = input('What template do you want to install: ') profile = input('What template do you want to install: ')
instructions = get_instructions(profile) instructions = get_instructions(profile)
if first and len(instructions) <= 0: if first and len(instructions) <= 0:
print('[E] No instructions by the name of {} was found.'.format(profile)) print('[E] No instructions by the name of {} was found.'.format(profile))
print(' Installation won\'t continue until a valid profile is given.') print(' Installation won\'t continue until a valid profile is given.')
print(' (this is because --default is not instructed and no --profile given)') print(' (this is because --default is not instructed and no --profile given)')
first = False first = False
# TODO: Might not need to return anything here, passed by reference? # TODO: Might not need to return anything here, passed by reference?
instructions = merge_in_includes(instructions) instructions = merge_in_includes(instructions)