diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2015-05-06 18:18:43 +0200 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2015-05-06 18:21:51 +0200 |
| commit | d79acc309327f8c0863bd3da8b93d926a1c93ba1 (patch) | |
| tree | 563a1eb14323f7346bdd0378481c300d6ea9c4ce /src/core/manager.c | |
| parent | f2bf5007a97bf5993128a6e16105005f819b60cf (diff) | |
bus: don't switch to kdbus if not requested
Whenever systemd is re-executed, it tries to create a system bus via
kdbus. If the system did not have kdbus loaded during bootup, but the
module is loaded later on manually, this will cause two system buses
running (kdbus and dbus-daemon in parallel).
This patch makes sure we never try to create kdbus buses if it wasn't
explicitly requested on the command-line.
Diffstat (limited to 'src/core/manager.c')
| -rw-r--r-- | src/core/manager.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 8c8645b68d..c918f191c9 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -721,6 +721,8 @@ static int manager_setup_kdbus(Manager *m) { if (m->test_run || m->kdbus_fd >= 0) return 0; + if (!is_kdbus_available()) + return -ESOCKTNOSUPPORT; if (m->running_as == SYSTEMD_SYSTEM && detect_container(NULL) <= 0) bus_kernel_fix_attach_mask(); |