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

Merge pull request #158 from advaithm/master 

Network manager support
This commit is contained in:
Anton Hvornum 2021-04-04 09:37:29 +00:00 committed by GitHub
parent b37c0cc5d7 8ad4a7d1c4
commit f452655d4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archinstall/lib/user_interaction.py
View File

@ -94,10 +94,12 @@ def ask_to_configure_network():
# Optionally configure one network interface. # Optionally configure one network interface.
#while 1: #while 1:
# {MAC: Ifname} # {MAC: Ifname}
interfaces = {'ISO-CONFIG' : 'Copy ISO network configuration to installation', **list_interfaces()} interfaces = {'ISO-CONFIG' : 'Copy ISO network configuration to installation','NetworkManager':'Use NetworkManager to control and manage your internet connection', **list_interfaces()}
nic = generic_select(interfaces.values(), "Select one network interface to configure (leave blank to skip): ") nic = generic_select(interfaces.values(), "Select one network interface to configure (leave blank to skip): ")
if nic and nic != 'Copy ISO network configuration to installation': if nic and nic != 'Copy ISO network configuration to installation':
if nic == 'Use NetworkManager to control and manage your internet connection':
return {'nic': nic,'NetworkManager':True}
mode = generic_select(['DHCP (auto detect)', 'IP (static)'], f"Select which mode to configure for {nic}: ") mode = generic_select(['DHCP (auto detect)', 'IP (static)'], f"Select which mode to configure for {nic}: ")
if mode == 'IP (static)': if mode == 'IP (static)':
while 1: while 1:

4
examples/guided.py
View File

@ -320,7 +320,9 @@ def perform_installation(device, boot_partition, language, mirrors):
# 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', None) == '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):
installation.add_additional_packages("networkmanager")
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', None):
installation.configure_nic(**archinstall.arguments.get('nic', {})) installation.configure_nic(**archinstall.arguments.get('nic', {}))