diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2019-11-02 07:01:28 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-11-03 07:51:24 +0100 |
| commit | 186d22a9634e2bf94658ed6f1cf2b332ecb3a32c (patch) | |
| tree | d837f6620348ec6bd93e42804337cca07cbdc482 | |
| parent | 59923ad85d1a1cf2216a4f14649702d24d3f2360 (diff) | |
| download | NetworkManager-lr/fix-iwd-1-0.tar.gz | |
iwd: unbreak iwd-1.0lr/fix-iwd-1-0
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.
| -rw-r--r-- | src/devices/wifi/nm-iwd-manager.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/devices/wifi/nm-iwd-manager.c index e83f8063ce..470cb1c902 100644 --- a/src/devices/wifi/nm-iwd-manager.c +++ b/src/devices/wifi/nm-iwd-manager.c @@ -262,10 +262,18 @@ register_agent (NMIwdManager *self) 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, + "/", + NM_IWD_AGENT_MANAGER_INTERFACE); + } + + if (!agent_manager) { _LOGE ("unable to register the IWD Agent: PSK/8021x Wi-Fi networks may not work"); return; } |