system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-09-06 17:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

libnm/client: do not autostart the service

Browse source 
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
This commit is contained in:
Lubomir Rintel 2016-11-16 18:49:11 +01:00
parent d0c01cc79d
commit cb61dd113c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnm/nm-client.c
View file

@ -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,