From 537b9cab037aecfd18edef156dd3ea55072918e9 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 1 Mar 2022 01:57:57 +1100 Subject: Rework network config (#1001) * Update network configuration * Rework network configuration * Update documentation * Fix flake8 * Update Co-authored-by: Daniel Girtler Co-authored-by: Anton Hvornum --- docs/installing/guided.rst | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/installing/guided.rst b/docs/installing/guided.rst index 5c360256..ac6254f2 100644 --- a/docs/installing/guided.rst +++ b/docs/installing/guided.rst @@ -73,8 +73,7 @@ There are three different configuration files, all of which are optional. "keyboard-language": "us", "mirror-region": "Worldwide", "nic": { - "NetworkManager": true, - "nic": "Use NetworkManager (necessary to configure internet graphically in GNOME and KDE)" + "type": "NM" }, "ntp": true, "packages": ["docker", "git", "wget", "zsh"], @@ -124,9 +123,13 @@ Options for ``--config`` | | | "Worldwide" or "Sweden" | | Either takes a dictionary structure of region and a given set of mirrors. | | | | | | Or just a region and archinstall will source any mirrors for that region automatically | | +----------------------+--------------------------------------------------------+---------------------------------------------------------------------------------------------+-----------------------------------------------+ -| nic | | { NetworkManager: } | | Takes three different kind of options. Copy, NetworkManager or a nic name. | No | -| | | { "eth0": {"address": "", "subnet": "255.0.0.0"}}| | Copy will copy the network configuration used in the live ISO. NetworkManager will | | -| | | "Copy ISO network configuration to installation" | | install and configure `NetworkManager `_ | | +| nic | | { type: } | | Type must be one of ISO, NM, MANUAL. ISO will copy the configuration on the image, | No | +| | | | | NM configures NetworkManager and MANUAL allows to specify custom configuration | | +| | | { "iface": "eth0"} | | Only MANUAL: name of the interface | | +| | | { "dhcp": } | | Only MANUAL: If set to true DHCP auto will be setup and all further configs ignored | | +| | | { "ip": } | | Only MANUAL: Ip address to set, is MANDATORY | | +| | | { "gateway": } | | Only MANUAL: Optional gateway | | +| | | { "dns": []} | | Only MANUAL: Optional DNS servers | | +----------------------+--------------------------------------------------------+---------------------------------------------------------------------------------------------+-----------------------------------------------+ | ntp | | Set to true to set-up ntp post install | No | +----------------------+--------------------------------------------------------+---------------------------------------------------------------------------------------------+-----------------------------------------------+ -- cgit v1.2.3-70-g09d2