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

Fixing a logic issue with ask_to_configure_network(). It no longer returns None if skipped, it returns a dict so that we can do sub-level logic checks in guided.

This commit is contained in:
Anton Hvornum 2021-04-13 10:27:33 +02:00
parent 67b05d8fb1
commit 311426cbc2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archinstall/lib/user_interaction.py
View File

@ -186,7 +186,7 @@ def ask_to_configure_network():
elif nic: elif nic:
return nic return nic
return None return {}
def ask_for_disk_layout(): def ask_for_disk_layout():
options = { options = {

6
examples/guided.py
View File

@ -292,13 +292,13 @@ def perform_installation(mountpoint):
# If user selected to copy the current ISO network configuration # If user selected to copy the current ISO network configuration
# Perform a copy of the config # Perform a copy of the config
if archinstall.arguments.get('nic', None) == 'Copy ISO network configuration to installation': if archinstall.arguments.get('nic', {}) == 'Copy ISO network configuration to installation':
installation.copy_ISO_network_config(enable_services=True) # Sources the ISO network configuration to the install medium. installation.copy_ISO_network_config(enable_services=True) # Sources the ISO network configuration to the install medium.
elif archinstall.arguments.get('nic',{}).get('NetworkManager',False): elif archinstall.arguments.get('nic', {}).get('NetworkManager',False):
installation.add_additional_packages("networkmanager") installation.add_additional_packages("networkmanager")
installation.enable_service('NetworkManager.service') installation.enable_service('NetworkManager.service')
# Otherwise, if a interface was selected, configure that interface # Otherwise, if a interface was selected, configure that interface
elif archinstall.arguments.get('nic', None): elif archinstall.arguments.get('nic', {}):
installation.configure_nic(**archinstall.arguments.get('nic', {})) installation.configure_nic(**archinstall.arguments.get('nic', {}))
installation.enable_service('systemd-networkd') installation.enable_service('systemd-networkd')
installation.enable_service('systemd-resolved') installation.enable_service('systemd-resolved')