diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-05-18 17:27:37 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-05-18 17:27:42 +0200 |
| commit | a363680faa063dbcb624a6dfc4798cff0a4ba9d5 (patch) | |
| tree | 56ca6b0358847abd4e9f2cdc6ecce5323ad50f8e | |
| parent | 958b66ea16deddd794b3a52643bd44633e165ead (diff) | |
kmod-setup: conditionalize kmod autoloading properly
Load kdbus.ko only if we are built with kdbus, and load ip_tables.ko
only if we are built with iptables support.
| -rw-r--r-- | src/core/kmod-setup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c index 132c3e866c..6cc5951719 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -65,11 +65,15 @@ int kmod_setup(void) { /* this should never be a module */ { "unix", "/proc/net/unix", true, NULL }, +#ifdef ENABLE_KDBUS /* IPC is needed before we bring up any other services */ { "kdbus", "/sys/fs/kdbus", false, is_kdbus_wanted }, +#endif +#ifdef HAVE_LIBIPTC /* netfilter is needed by networkd, nspawn among others, and cannot be autoloaded */ { "ip_tables", "/proc/net/ip_tables_names", false, NULL }, +#endif }; struct kmod_ctx *ctx = NULL; unsigned int i; |