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

One step in fixing #20. User-given parameters override template. And next is reworking the inheritance structure of the templates

This commit is contained in:
Anton Hvornum 2019-11-29 15:09:05 +01:00
parent 2c65800d29
commit 56ad7efe84
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
archinstall.py
View File

@ -28,18 +28,6 @@ harddrives = oDict()
commandlog = [] commandlog = []
worker_history = oDict() worker_history = oDict()
instructions = 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 import logging
from systemd.journal import JournalHandler from systemd.journal import JournalHandler
@ -1134,7 +1122,17 @@ if __name__ == '__main__':
## Setup some defaults ## Setup some defaults
# (in case no command-line parameters or netdeploy-params were given) # (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, ## == If we got networking,
# Try fetching instructions for this box unless a specific profile was given, and execute them. # Try fetching instructions for this box unless a specific profile was given, and execute them.