diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-11-16 18:49:11 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-11-16 19:52:24 +0100 |
| commit | cb61dd113c8f2209e4dca96134c91b40d2cefccb (patch) | |
| tree | fc159fa9ad152bc83d28933c9f7c3769ae5f9d0a /libnm | |
| parent | d0c01cc79daf62b83e52eea4d6302ddc42f1f5f0 (diff) | |
| download | NetworkManager-cb61dd113c8f2209e4dca96134c91b40d2cefccb.tar.gz | |
libnm/client: do not autostart the service
Apparently, the client is used by the services we depend on (firewalld),
and an attempt to start the service would deadlock them.
This was an accidental change anyway.
Related firewalld change: https://github.com/t-woerner/firewalld/pull/171
Diffstat (limited to 'libnm')
| -rw-r--r-- | libnm/nm-client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnm/nm-client.c b/libnm/nm-client.c index 543f0b8726..b0dc3660ee 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -2142,7 +2142,7 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) gchar *name_owner; priv->object_manager = g_dbus_object_manager_client_new_for_bus_sync (_nm_dbus_bus_type (), - G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE, + G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START, "org.freedesktop.NetworkManager", "/org/freedesktop", proxy_type, NULL, NULL, @@ -2344,7 +2344,7 @@ prepare_object_manager (NMClient *client, g_simple_async_result_set_op_res_gboolean (init_data->result, TRUE); g_dbus_object_manager_client_new_for_bus (_nm_dbus_bus_type (), - G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE, + G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START, "org.freedesktop.NetworkManager", "/org/freedesktop", proxy_type, NULL, NULL, |