summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-03-13 23:34:47 +0100
committerThomas Haller <thaller@redhat.com>2015-03-19 16:29:56 +0100
commitc16fabb60eca7602003dc89613c192a3efc944ca (patch)
tree9fc0626d0868bd9972c41c79dc60a18601e300b5
parentc2b2ffe6b9a378deaa236d6223596fd5b7b9b19b (diff)
downloadNetworkManager-th/main-order-bgo746254.tar.gz
main: (order) early start D-Bus serviceth/main-order-bgo746254
systemd considers the startup time of NetworkManager until the D-Bus service is claimed. By doing that earlier this time is significantly reduced. This has the advantage, that services that are ordered to start after NetworkManager can start earlier.
-rw-r--r--src/main.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/main.c b/src/main.c
index 9d257a2408..adc1f8efc3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -412,6 +412,21 @@ main (int argc, char *argv[])
#endif
);
+ if (!nm_dbus_manager_get_connection (nm_dbus_manager_get ())) {
+#if HAVE_DBUS_GLIB_100
+ nm_log_warn (LOGD_CORE, "Failed to connect to D-Bus; only private bus is available");
+#else
+ nm_log_err (LOGD_CORE, "Failed to connect to D-Bus, exiting...");
+ goto done;
+#endif
+ } else {
+ /* Start our DBus service */
+ if (!nm_dbus_manager_start_service (nm_dbus_manager_get ())) {
+ nm_log_err (LOGD_CORE, "failed to start the dbus service.");
+ goto done;
+ }
+ }
+
/* Set up platform interaction layer */
nm_linux_platform_setup ();
@@ -439,21 +454,6 @@ main (int argc, char *argv[])
goto done;
}
- if (!nm_dbus_manager_get_connection (nm_dbus_manager_get ())) {
-#if HAVE_DBUS_GLIB_100
- nm_log_warn (LOGD_CORE, "Failed to connect to D-Bus; only private bus is available");
-#else
- nm_log_err (LOGD_CORE, "Failed to connect to D-Bus, exiting...");
- goto done;
-#endif
- } else {
- /* Start our DBus service */
- if (!nm_dbus_manager_start_service (nm_dbus_manager_get ())) {
- nm_log_err (LOGD_CORE, "failed to start the dbus service.");
- goto done;
- }
- }
-
g_signal_connect (manager, NM_MANAGER_CONFIGURE_QUIT, G_CALLBACK (manager_configure_quit), config);
nm_manager_start (manager);