colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iwd: unbreak iwd-1.0

Browse Source 
The upstream apparently thought it's a great idea to change the agent
manager path. This fixes things for those unfortunate enough to run
IWD.
This commit is contained in:
Lubomir Rintel
2019-11-02 07:01:28 +01:00
parent 59923ad85d
commit 186d22a963
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/wifi/nm-iwd-manager.c
View File

@@ -261,9 +261,17 @@ register_agent (NMIwdManager *self)
NMIwdManagerPrivate *priv = NM_IWD_MANAGER_GET_PRIVATE (self); NMIwdManagerPrivate *priv = NM_IWD_MANAGER_GET_PRIVATE (self);
GDBusInterface *agent_manager; GDBusInterface *agent_manager;
agent_manager = g_dbus_object_manager_get_interface (priv->object_manager,
"/net/connman/iwd",
NM_IWD_AGENT_MANAGER_INTERFACE);
if (!agent_manager) {
/* IWD prior to 1.0 dated 30 October, 2019 has the agent manager on a
* different path. */
agent_manager = g_dbus_object_manager_get_interface (priv->object_manager, agent_manager = g_dbus_object_manager_get_interface (priv->object_manager,
"/", "/",
NM_IWD_AGENT_MANAGER_INTERFACE); NM_IWD_AGENT_MANAGER_INTERFACE);
}
if (!agent_manager) { if (!agent_manager) {
_LOGE ("unable to register the IWD Agent: PSK/8021x Wi-Fi networks may not work"); _LOGE ("unable to register the IWD Agent: PSK/8021x Wi-Fi networks may not work");