Skip to content

Fix: IWD switch case #4239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
h8d13 wants to merge 1 commit into from
+9 −12
Closed

Fix: IWD switch case #4239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions archinstall/default_profiles/desktop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ def packages(self) -> list[str]:
'openssh',
'htop',
'wget',
'iwd',
'wireless_tools',
'smartmontools',
'xdg-utils',
]
Expand Down
19 changes: 9 additions & 10 deletions archinstall/lib/network/network_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,24 @@ def install_network_config(
enable_services=True, # Sources the ISO network configuration to the install medium.
)
case NicType.NM | NicType.NM_IWD:
# Install NetworkManager package for both cases
packages = ['networkmanager']
# Default back-end only for non-iwd
if network_config.type == NicType.NM:
packages.append('wpa_supplicant')
if network_config.type == NicType.NM: # default
packages.extend(['wpa_supplicant', 'wireless_tools'])
else: # iwd better support for some wifi cards
packages.append('iwd')

installation.add_additional_packages(packages)

# Desktop profile -> Always add applet
if profile_config and profile_config.profile:
if profile_config.profile.is_desktop_profile():
installation.add_additional_packages('network-manager-applet')
# in any case if desktop
if profile_config and profile_config.profile and profile_config.profile.is_desktop_profile():
installation.add_additional_packages('network-manager-applet')

installation.enable_service('NetworkManager.service')

# special handling for NM iwd service + conf
if network_config.type == NicType.NM_IWD:
# NM_IWD special handling
installation.configure_nm_iwd()
installation.disable_service('iwd.service')

case NicType.MANUAL:
for nic in network_config.nics:
installation.configure_nic(nic)
Expand Down