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/kmod-setup.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/kmod-setup.c')
| -rw-r--r-- | src/core/kmod-setup.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c index 3503db52ed..fd1021f706 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -64,9 +64,6 @@ int kmod_setup(void) { /* this should never be a module */ { "unix", "/proc/net/unix", true, true, NULL }, - /* IPC is needed before we bring up any other services */ - { "kdbus", "/sys/fs/kdbus", false, false, is_kdbus_wanted }, - #ifdef HAVE_LIBIPTC /* netfilter is needed by networkd, nspawn among others, and cannot be autoloaded */ { "ip_tables", "/proc/net/ip_tables_names", false, false, NULL }, |