Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/__init__.py
diff options
context:
space:
mode:
authorDaniel <blackrabbit256@gmail.com>2022-03-01 01:57:57 +1100
committerGitHub <noreply@github.com>2022-02-28 15:57:57 +0100
commit537b9cab037aecfd18edef156dd3ea55072918e9 (patch)
treefe56cd4af527e816d831b220c6672c1dcfc2958f /archinstall/__init__.py
parentfa87d85708331ad45f28906217f94937bae474fe (diff)
Rework network config (#1001)
* Update network configuration * Rework network configuration * Update documentation * Fix flake8 * Update Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com> Co-authored-by: Anton Hvornum <anton.feeds@gmail.com>
Diffstat (limited to 'archinstall/__init__.py')
-rw-r--r--archinstall/__init__.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/archinstall/__init__.py b/archinstall/__init__.py
index cb95028b..8c64a1f3 100644
--- a/archinstall/__init__.py
+++ b/archinstall/__init__.py
@@ -123,7 +123,7 @@ def parse_unspecified_argument_list(unknowns :list, multiple :bool = False, erro
print(f" We ignore the entry {element} as it isn't related to any argument")
return config
-def get_arguments():
+def get_arguments() -> Dict[str, Any]:
""" The handling of parameters from the command line
Is done on following steps:
0) we create a dict to store the arguments and their values
@@ -203,13 +203,8 @@ def load_config():
storage['gfx_driver_packages'] = AVAILABLE_GFX_DRIVERS.get(arguments.get('gfx_driver', None), None)
if arguments.get('servers', None) is not None:
storage['_selected_servers'] = arguments.get('servers', None)
- if nic_config := arguments.get('nic', {}):
- if isinstance(nic_config,str) or nic_config.get('nic', '') == 'Copy ISO network configuration to installation':
- arguments['nic'] = {'type': 'iso_config'}
- elif 'NetworkManager' in nic_config:
- arguments['nic'] = {'type': 'network_manager', 'NetworkManager': True}
- else:
- arguments['nic'] = {k if k != 'nic' else 'type': v for k, v in nic_config.items()}
+ if arguments.get('nic', None) is not None:
+ arguments['nic'] = NetworkConfiguration.parse_arguments(arguments.get('nic'))
def post_process_arguments(arguments):
storage['arguments'] = arguments