Skip to content

Add constant for path /sys/class/net #4667

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

Merged
svartkanin merged 1 commit into from
Jul 25, 2026
Merged

Add constant for path /sys/class/net #4667

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
9 changes: 3 additions & 6 deletions archinstall/lib/network/wifi_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from dataclasses import dataclass
from pathlib import Path
from typing import assert_never, override

from archinstall.lib.command import SysCommand
from archinstall.lib.exceptions import SysCallError
from archinstall.lib.log import debug
from archinstall.lib.models.network import WifiConfiguredNetwork, WifiNetwork
from archinstall.lib.network.wpa_supplicant import WpaSupplicantConfig
from archinstall.lib.networking import SYS_NET
from archinstall.lib.translationhandler import tr
from archinstall.tui.components import ConfirmationScreen, InputScreen, InstanceRunnable, LoadingScreen, NotifyScreen, TableSelectionScreen, tui
from archinstall.tui.menu_item import MenuItem, MenuItemGroup
Expand Down Expand Up @@ -86,11 +86,8 @@ async def _enable_supplicant(self, wifi_iface: str) -> bool:
return False

def _find_wifi_interface(self) -> str | None:
net_path = Path('/sys/class/net')

for iface in net_path.iterdir():
maybe_wireless_path = net_path / iface / 'wireless'
if maybe_wireless_path.is_dir():
for iface in SYS_NET.iterdir():
if (iface / 'wireless').is_dir():
return iface.name

return None
Expand Down
14 changes: 9 additions & 5 deletions archinstall/lib/networking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
import ssl
import struct
import time
from pathlib import Path
from types import FrameType, TracebackType
from typing import Self
from typing import Final, Self
from urllib.error import URLError
from urllib.parse import urlencode
from urllib.request import urlopen
Expand All @@ -16,6 +17,8 @@
from archinstall.lib.log import debug, error, info
from archinstall.lib.pacman.pacman import Pacman

SYS_NET: Final = Path('/sys/class/net')


class DownloadTimer:
"""
Expand Down Expand Up @@ -105,13 +108,14 @@ def enrich_iface_types(interfaces: list[str]) -> dict[str, str]:
result = {}

for iface in interfaces:
if os.path.isdir(f'/sys/class/net/{iface}/bridge/'):
path = SYS_NET / iface
if (path / 'bridge').is_dir():
result[iface] = 'BRIDGE'
elif os.path.isfile(f'/sys/class/net/{iface}/tun_flags'):
elif (path / 'tun_flags').is_file():
# ethtool -i {iface}
result[iface] = 'TUN/TAP'
elif os.path.isdir(f'/sys/class/net/{iface}/device'):
if os.path.isdir(f'/sys/class/net/{iface}/wireless/'):
elif (path / 'device').is_dir():
if (path / 'wireless').is_dir():
result[iface] = 'WIRELESS'
else:
result[iface] = 'PHYSICAL'
Expand Down