X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fkmod-setup.c;h=efbdf31688cd56d8dd52abdcd899c39b4eb898e4;hb=340a1d2330ddc1dd18ad75bcdddf32f63c84b4a1;hp=9709d364f8bfd7ee6bc6d2d4c624a010ed872325;hpb=b43b8f7a7e088c31416374340f576887968f7cad;p=elogind.git
diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index 9709d364f..efbdf3168 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -19,20 +19,18 @@
along with systemd; If not, see .
***/
-#include
#include
#include
-#include
+
+#ifdef HAVE_KMOD
#include
+#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,21 +40,19 @@ 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) {
- _cleanup_free_ char *line = NULL;
-
- if (proc_cmdline(&line) <= 0)
- return false;
-
- return strstr(line, "kdbus") != NULL;
+ return get_proc_cmdline_key("kdbus", NULL) > 0;
}
+#endif
int kmod_setup(void) {
+#ifdef HAVE_KMOD
+
static const struct {
const char *module;
const char *path;
@@ -64,21 +60,24 @@ 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/bus/kdbus", false, cmdline_check_kdbus },
+ { "kdbus", "/sys/fs/kdbus", false, cmdline_check_kdbus },
};
struct kmod_ctx *ctx = NULL;
unsigned int i;
int r;
+ if (have_effective_cap(CAP_SYS_MODULE) == 0)
+ return 0;
+
for (i = 0; i < ELEMENTSOF(kmod_table); i++) {
struct kmod_module *mod;
@@ -122,5 +121,6 @@ int kmod_setup(void) {
if (ctx)
kmod_unref(ctx);
+#endif
return 0;
}