From a03e7fb74f792062110d9a1ff15e7df87bfd787d Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 16 Jul 2012 19:53:04 -0500 Subject: [PATCH] callouts: don't queue the DHCP callout's bus name request (bgo #680041) If queueing the name isn't allowed, and two instances that start in close succession, one instance will fail because it can't claim the bus name. --- callouts/nm-dhcp-client-action.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/callouts/nm-dhcp-client-action.c b/callouts/nm-dhcp-client-action.c index 078c93a09..d1a3747ce 100644 --- a/callouts/nm-dhcp-client-action.c +++ b/callouts/nm-dhcp-client-action.c @@ -251,10 +251,7 @@ dbus_init (void) dbus_connection_set_exit_on_disconnect (connection, FALSE); dbus_error_init (&error); - ret = dbus_bus_request_name (connection, - NM_DHCP_CLIENT_DBUS_SERVICE, - DBUS_NAME_FLAG_DO_NOT_QUEUE, - &error); + ret = dbus_bus_request_name (connection, NM_DHCP_CLIENT_DBUS_SERVICE, 0, &error); if (dbus_error_is_set (&error)) { fprintf (stderr, "Error: Could not acquire the NM DHCP client service. " "Message: (%s) %s\n",