diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2016-06-10 15:50:16 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-06-18 23:24:23 +0200 |
| commit | 222953e87f34545a3f9c6d3c18216e222bf6ea94 (patch) | |
| tree | 529adf6bffb7fb2a8cd9b91e5ab3b19bb6270510 /src/core/busname.c | |
| parent | Merge pull request #3557 from whot/hwdb-updates (diff) | |
| download | systemd-222953e87f34545a3f9c6d3c18216e222bf6ea94.tar.xz systemd-222953e87f34545a3f9c6d3c18216e222bf6ea94.zip | |
Ensure kdbus isn't used (#3501)
Delete the dbus1 generator and some critical wiring. This prevents
kdbus from being loaded or detected. As such, it will never be used,
even if the user still has a useful kdbus module loaded on their system.
Sort of fixes #3480. Not really, but it's better than the current state.
Diffstat (limited to 'src/core/busname.c')
| -rw-r--r-- | src/core/busname.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/core/busname.c b/src/core/busname.c index f03a95c24e..730be2ee14 100644 --- a/src/core/busname.c +++ b/src/core/busname.c @@ -998,12 +998,7 @@ static int busname_get_timeout(Unit *u, usec_t *timeout) { } static bool busname_supported(void) { - static int supported = -1; - - if (supported < 0) - supported = is_kdbus_available(); - - return supported; + return false; } static int busname_control_pid(Unit *u) { |