Merge branch '2.2' into 3.1

# Conflicts:
#	gns3server/compute/builtin/nodes/cloud.py
#	gns3server/utils/interfaces.py
This commit is contained in:
grossmj committed 2026-08-18 18:05:56 +02:00
commit 52de01523f
2 files changed
+3 -2

No files matched your search

+2 -1
View File
@@ -159,7 +159,7 @@ def is_interface_up(interface):
:returns: boolean
"""
if sys.platform.startswith("linux"):
if sys.platform.startswith("linux") or sys.platform.startswith("openbsd"):
if interface not in psutil.net_if_addrs():
return False
@@ -283,6 +283,7 @@ def interfaces():
"vmware",
"virtualbox",
"gns3",
"veb"
):
if result["name"].lower().startswith(special_interface):
result["special"] = True