From 56ad7efe845c19c39aa078fb427228e12ae8e559 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Fri, 29 Nov 2019 15:09:05 +0100 Subject: One step in fixing #20. User-given parameters override template. And next is reworking the inheritance structure of the templates --- archinstall.py | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/archinstall.py b/archinstall.py index 8437575c..5ce575c0 100644 --- a/archinstall.py +++ b/archinstall.py @@ -28,18 +28,6 @@ harddrives = oDict() commandlog = [] worker_history = oDict() instructions = oDict() -args = {} -positionals = [] -for arg in sys.argv[1:]: - if '--' == arg[:2]: - if '=' in arg: - key, val = [x.strip() for x in arg[2:].split('=')] - else: - key, val = arg[2:], True - args[key] = val - else: - positionals.append(arg) - import logging from systemd.journal import JournalHandler @@ -1134,7 +1122,17 @@ if __name__ == '__main__': ## Setup some defaults # (in case no command-line parameters or netdeploy-params were given) - args = setup_args_defaults(args) + args = setup_args_defaults() + positionals = [] + for arg in sys.argv[1:]: + if '--' == arg[:2]: + if '=' in arg: + key, val = [x.strip() for x in arg[2:].split('=')] + else: + key, val = arg[2:], True + args[key] = val + else: + positionals.append(arg) ## == If we got networking, # Try fetching instructions for this box unless a specific profile was given, and execute them. -- cgit v1.2.3-54-g00ecf