Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds@gmail.com>2021-04-13 10:27:33 +0200
committerAnton Hvornum <anton.feeds@gmail.com>2021-04-13 10:27:33 +0200
commit311426cbc22d72fd3d858ef1580b5d6d1f6b5665 (patch)
treeae10ec7ce7679448dde5b6e86fe86866ff945f14
parent67b05d8fb13c5a417d063ead1f8add6c0f15c226 (diff)
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.
-rw-r--r--archinstall/lib/user_interaction.py2
-rw-r--r--examples/guided.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index de5813bb..99cf6274 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -186,7 +186,7 @@ def ask_to_configure_network():
elif nic:
return nic
- return None
+ return {}
def ask_for_disk_layout():
options = {
diff --git a/examples/guided.py b/examples/guided.py
index 7223ebbe..b4a3a7f7 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -292,13 +292,13 @@ def perform_installation(mountpoint):
# If user selected to copy the current ISO network configuration
# 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.
- elif archinstall.arguments.get('nic',{}).get('NetworkManager',False):
+ 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
- elif archinstall.arguments.get('nic', None):
+ elif archinstall.arguments.get('nic', {}):
installation.configure_nic(**archinstall.arguments.get('nic', {}))
installation.enable_service('systemd-networkd')
installation.enable_service('systemd-resolved')