summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-04-22 13:50:56 +0200
committerLennart Poettering <lennart@poettering.net>2015-04-22 13:50:56 +0200
commit1d3087978a8ee23107cb64aa55ca97aefe9531e2 (patch)
tree8959bc3371db3b0c271301c121555dc8140687e4
parenta4b756b1ed4ae9983b9d4df77973679480870c8b (diff)
kmod-setup: load ip_tables kmod at boot
The module is currently no auto-loadable (and this is unlikely to change anytime soon, given it's API is via getsockopt/setsockopt). It is needed by networkd and nspawn currently. Users who really don't like the module to be loaded have the option to blacklist it still, or not compile it at all. But for all others this should make things work out-of-the-box.
-rw-r--r--src/core/kmod-setup.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index efbdf31688..c5117b47ee 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -60,16 +60,19 @@ int kmod_setup(void) {
bool (*condition_fn)(void);
} kmod_table[] = {
/* auto-loading on use doesn't work before udev is up */
- { "autofs4", "/sys/class/misc/autofs", true, NULL },
+ { "autofs4", "/sys/class/misc/autofs", true, NULL },
/* early configure of ::1 on the loopback device */
- { "ipv6", "/sys/module/ipv6", true, NULL },
+ { "ipv6", "/sys/module/ipv6", true, NULL },
/* this should never be a module */
- { "unix", "/proc/net/unix", true, NULL },
+ { "unix", "/proc/net/unix", true, NULL },
/* IPC is needed before we bring up any other services */
- { "kdbus", "/sys/fs/kdbus", false, cmdline_check_kdbus },
+ { "kdbus", "/sys/fs/kdbus", false, cmdline_check_kdbus },
+
+ /* netfilter is needed by networkd, nspawn among others, and cannot be autoloaded */
+ { "ip_tables", "/proc/net/ip_tables_names", false, NULL },
};
struct kmod_ctx *ctx = NULL;
unsigned int i;