summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-12-03 19:55:51 +0100
committerLennart Poettering <lennart@poettering.net>2013-12-03 19:55:51 +0100
commita6aa89122d2fa5e811a72200773068c13bfffea2 (patch)
treebf75aa373cf240ea0130daaa726423da88520970 /src/core
parent0e7be1293fe70eed47b20f70f74a2a67fc87be17 (diff)
bus: don't make use of the private bus socket if kdbus is available
Diffstat (limited to 'src/core')
-rw-r--r--src/core/dbus.c4
-rw-r--r--src/core/manager.c2
2 files changed, 5 insertions, 1 deletions
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;