From a6aa89122d2fa5e811a72200773068c13bfffea2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 3 Dec 2013 19:55:51 +0100 Subject: bus: don't make use of the private bus socket if kdbus is available --- src/core/dbus.c | 4 ++++ src/core/manager.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/dbus.c b/src/core/dbus.c index cab7628ad0..25d83a6942 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -938,6 +938,10 @@ static int bus_init_private(Manager *m) { if (m->private_listen_fd >= 0) return 0; + /* We don't need the private socket if we have kdbus */ + if (m->kdbus_fd >= 0) + return 0; + if (m->running_as == SYSTEMD_SYSTEM) { /* We want the private bus only when running as init */ diff --git a/src/core/manager.c b/src/core/manager.c index 19493861ec..0a3e840de7 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -428,7 +428,7 @@ static int manager_setup_kdbus(Manager *m) { return m->kdbus_fd; } - log_info("Successfully set up kdbus on %s", p); + log_debug("Successfully set up kdbus on %s", p); #endif return 0; -- cgit v1.2.3-54-g00ecf