X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fkmod-setup.c;h=c0a05b97aac87b7bf74fed1993d2517b82fe40bf;hp=e4885fb2128f6c579a99d80c87c63591f81ab1ee;hb=3da44ef53b949021e960d6169e809e297f2b7f65;hpb=b4b879648c378e7cfaef940489c3c1ccc21b27e0

diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index e4885fb21..c0a05b97a 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -23,16 +23,17 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
+
+#ifdef HAVE_KMOD
 #include <libkmod.h>
+#endif
 
 #include "macro.h"
 #include "execute.h"
-
+#include "capability.h"
 #include "kmod-setup.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-
+#ifdef HAVE_KMOD
 static void systemd_kmod_log(
                 void *data,
                 int priority,
@@ -42,40 +43,57 @@ static void systemd_kmod_log(
                 va_list args) {
 
         /* library logging is enabled at debug only */
-        log_metav(LOG_DEBUG, file, line, fn, format, args);
+        DISABLE_WARNING_FORMAT_NONLITERAL;
+        log_internalv(LOG_DEBUG, 0, file, line, fn, format, args);
+        REENABLE_WARNING;
 }
 
-#pragma GCC diagnostic pop
+static bool cmdline_check_kdbus(void) {
+        return get_proc_cmdline_key("kdbus", NULL) > 0;
+}
+#endif
 
 int kmod_setup(void) {
-
-        static const char kmod_table[] =
-                /* This one we need to load explicitly, since
-                 * auto-loading on use doesn't work before udev
-                 * created the ghost device nodes, and we need it
-                 * earlier than that. */
-                "autofs4\0" "/sys/class/misc/autofs\0"
-
-                /* This one we need to load explicitly, since
-                 * auto-loading of IPv6 is not done when we try to
-                 * configure ::1 on the loopback device. */
-                "ipv6\0"    "/sys/module/ipv6\0"
-
-                "unix\0"    "/proc/net/unix\0";
-
+#ifdef HAVE_KMOD
+
+        static const struct {
+                const char *module;
+                const char *path;
+                bool warn;
+                bool (*condition_fn)(void);
+        } kmod_table[] = {
+                /* auto-loading on use doesn't work before udev is up */
+                { "autofs4", "/sys/class/misc/autofs", true, NULL                 },
+
+                /* early configure of ::1 on the loopback device */
+                { "ipv6",    "/sys/module/ipv6",       true, NULL                 },
+
+                /* this should never be a module */
+                { "unix",    "/proc/net/unix",         true, NULL                 },
+
+                /* IPC is needed before we bring up any other services */
+                { "kdbus",   "/sys/fs/kdbus",          false, cmdline_check_kdbus },
+        };
         struct kmod_ctx *ctx = NULL;
-        const char *name, *path;
+        unsigned int i;
         int r;
 
-        NULSTR_FOREACH_PAIR(name, path, kmod_table) {
+        if (have_effective_cap(CAP_SYS_MODULE) == 0)
+                return 0;
+
+        for (i = 0; i < ELEMENTSOF(kmod_table); i++) {
                 struct kmod_module *mod;
 
-                if (access(path, F_OK) >= 0)
+                if (kmod_table[i].path && access(kmod_table[i].path, F_OK) >= 0)
+                        continue;
+
+                if (kmod_table[i].condition_fn && !kmod_table[i].condition_fn())
                         continue;
 
-                log_debug("Your kernel apparently lacks built-in %s support. Might be a good idea to compile it in. "
-                          "We'll now try to work around this by loading the module...",
-                          name);
+                if (kmod_table[i].warn)
+                        log_debug("Your kernel apparently lacks built-in %s support. Might be "
+                                  "a good idea to compile it in. We'll now try to work around "
+                                  "this by loading the module...", kmod_table[i].module);
 
                 if (!ctx) {
                         ctx = kmod_new(NULL, NULL);
@@ -86,9 +104,9 @@ int kmod_setup(void) {
                         kmod_load_resources(ctx);
                 }
 
-                r = kmod_module_new_from_name(ctx, name, &mod);
+                r = kmod_module_new_from_name(ctx, kmod_table[i].module, &mod);
                 if (r < 0) {
-                        log_error("Failed to lookup module '%s'", name);
+                        log_error("Failed to lookup module '%s'", kmod_table[i].module);
                         continue;
                 }
 
@@ -97,7 +115,7 @@ int kmod_setup(void) {
                         log_info("Inserted module '%s'", kmod_module_get_name(mod));
                 else if (r == KMOD_PROBE_APPLY_BLACKLIST)
                         log_info("Module '%s' is blacklisted", kmod_module_get_name(mod));
-                else
+                else if (kmod_table[i].warn)
                         log_error("Failed to insert module '%s'", kmod_module_get_name(mod));
 
                 kmod_module_unref(mod);
@@ -106,5 +124,6 @@ int kmod_setup(void) {
         if (ctx)
                 kmod_unref(ctx);
 
+#endif
         return 0;
 }