X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmodules-load.c;h=0f2144c2ed84b853e6df14dfc037f3c74796afe2;hp=44ff02e7b83c46518008a7c49899ddf029a1bc59;hb=90ccc3fca7e53a60a9e67b9d5812e1d4a27fc07d;hpb=b2423f1f436f847d9fc96a63679be2b5552b6baf
diff --git a/src/modules-load.c b/src/modules-load.c
index 44ff02e7b..0f2144c2e 100644
--- a/src/modules-load.c
+++ b/src/modules-load.c
@@ -6,16 +6,16 @@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
***/
@@ -26,142 +26,130 @@
#include
#include
#include
+#include
#include "log.h"
#include "util.h"
#include "strv.h"
-/* This reads all module names listed in /etc/modules.d/?*.modules and
- * loads them into the kernel. This follows roughly Debian's way to
- * handle modules, but uses a directory of fragments instead of a
- * single /etc/modules file. */
-
-static int scandir_filter(const struct dirent *d) {
- assert(d);
-
- if (ignore_file(d->d_name))
- return 0;
-
- if (d->d_type != DT_REG &&
- d->d_type != DT_LNK)
- return 0;
-
- return endswith(d->d_name, ".modules");
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+static void systemd_kmod_log(void *data, int priority, const char *file, int line,
+ const char *fn, const char *format, va_list args)
+{
+ log_meta(priority, file, line, fn, format, args);
}
+#pragma GCC diagnostic pop
int main(int argc, char *argv[]) {
- struct dirent **de = NULL;
- int r = 1, n, i;
- char **arguments = NULL;
- unsigned n_arguments = 0, n_allocated = 0;
+ int r = EXIT_FAILURE;
+ char **files, **fn;
+ struct kmod_ctx *ctx;
+ const int probe_flags = KMOD_PROBE_APPLY_BLACKLIST|KMOD_PROBE_IGNORE_LOADED;
if (argc > 1) {
log_error("This program takes no argument.");
- return 1;
+ return EXIT_FAILURE;
}
- log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+ log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();
- if (!(arguments = strv_new("/sbin/modprobe", "-sab", "--", NULL))) {
- log_error("Failed to allocate string array");
+ umask(0022);
+
+ ctx = kmod_new(NULL, NULL);
+ if (!ctx) {
+ log_error("Failed to allocate memory for kmod.");
goto finish;
}
- n_arguments = n_allocated = 3;
+ kmod_load_resources(ctx);
- if ((n = scandir("/etc/modules.d/", &de, scandir_filter, alphasort)) < 0) {
-
- if (errno == ENOENT)
- r = 0;
- else
- log_error("Failed to enumerate /etc/modules.d/ files: %m");
+ kmod_set_log_fn(ctx, systemd_kmod_log, NULL);
+ if (conf_files_list(&files, ".conf",
+ "/etc/modules-load.d",
+ "/run/modules-load.d",
+ "/usr/local/lib/modules-load.d",
+ "/usr/lib/modules-load.d",
+#ifdef HAVE_SPLIT_USR
+ "/lib/modules-load.d",
+#endif
+ NULL) < 0) {
+ log_error("Failed to enumerate modules-load.d files: %s", strerror(-r));
goto finish;
}
- r = 0;
+ r = EXIT_SUCCESS;
- for (i = 0; i < n; i++) {
- int k;
- char *fn;
+ STRV_FOREACH(fn, files) {
FILE *f;
- k = asprintf(&fn, "/etc/modules.d/%s", de[i]->d_name);
- free(de[i]);
-
- if (k < 0) {
- log_error("Failed to allocate file name.");
- r = 1;
- continue;
- }
-
- f = fopen(fn, "re");
- free(fn);
-
+ f = fopen(*fn, "re");
if (!f) {
- log_error("Failed to open %s: %m", fn);
- r = 1;
+ if (errno == ENOENT)
+ continue;
+
+ log_error("Failed to open %s: %m", *fn);
+ r = EXIT_FAILURE;
continue;
}
+ log_debug("apply: %s\n", *fn);
for (;;) {
- char line[LINE_MAX], *l, *t;
+ char line[LINE_MAX], *l;
+ struct kmod_list *itr, *modlist = NULL;
+ int err;
- if (!(fgets(line, sizeof(line), f)))
+ if (!fgets(line, sizeof(line), f))
break;
l = strstrip(line);
if (*l == '#' || *l == 0)
continue;
- if (!(t = strdup(l))) {
- log_error("Failed to allocate module name.");
+ err = kmod_module_new_from_lookup(ctx, l, &modlist);
+ if (err < 0) {
+ log_error("Failed to lookup alias '%s'", l);
+ r = EXIT_FAILURE;
continue;
}
- if (n_arguments >= n_allocated) {
- char **a;
- unsigned m;
-
- m = MAX(16U, n_arguments*2);
-
- if (!(a = realloc(arguments, sizeof(char*) * (m+1)))) {
- log_error("Failed to increase module array size.");
- free(t);
- r = 1;
- continue;
+ kmod_list_foreach(itr, modlist) {
+ struct kmod_module *mod;
+
+ mod = kmod_module_get_module(itr);
+ err = kmod_module_probe_insert_module(mod, probe_flags,
+ NULL, NULL, NULL, NULL);
+
+ if (err == 0)
+ log_info("Inserted module '%s'", kmod_module_get_name(mod));
+ else if (err == KMOD_PROBE_APPLY_BLACKLIST)
+ log_info("Module '%s' is blacklisted", kmod_module_get_name(mod));
+ else {
+ log_error("Failed to insert '%s': %s", kmod_module_get_name(mod),
+ strerror(-err));
+ r = EXIT_FAILURE;
}
- arguments = a;
- n_allocated = m;
+ kmod_module_unref(mod);
}
- arguments[n_arguments++] = t;
+ kmod_module_unref_list(modlist);
}
if (ferror(f)) {
- r = 1;
log_error("Failed to read from file: %m");
+ r = EXIT_FAILURE;
}
fclose(f);
}
- free(de);
-
finish:
-
- if (n_arguments > 3) {
- arguments[n_arguments] = NULL;
- execv("/sbin/modprobe", arguments);
-
- log_error("Failed to execute /sbin/modprobe: %m");
- r = 1;
- }
-
- strv_free(arguments);
+ strv_free(files);
+ kmod_unref(ctx);
return r;
}