From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 18 May 2015 15:27:37 +0000 (+0200)
Subject: kmod-setup: conditionalize kmod autoloading properly
X-Git-Tag: v220~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a363680faa063dbcb624a6dfc4798cff0a4ba9d5;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index 132c3e866c0..6cc59517195 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;