X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmodules-load%2Fmodules-load.c;h=5f678789ce0024185c1bc25c491cd3185742f9e3;hp=0f2144c2ed84b853e6df14dfc037f3c74796afe2;hb=75e52a16f9ef476f1d18ec6d9c84e00149b80d03;hpb=dce818b390a857a11f7dd634684500675cf79833 diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c index 0f2144c2e..5f678789c 100644 --- a/src/modules-load/modules-load.c +++ b/src/modules-load/modules-load.c @@ -26,130 +26,263 @@ #include #include #include +#include #include #include "log.h" #include "util.h" #include "strv.h" +#include "conf-files.h" +#include "fileio.h" +#include "build.h" + +static char **arg_proc_cmdline_modules = NULL; + +static const char conf_file_dirs[] = CONF_DIRS_NULSTR("modules-load"); -#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); + const char *fn, const char *format, va_list args) { + + DISABLE_WARNING_FORMAT_NONLITERAL; + log_internalv(priority, 0, file, line, fn, format, args); + REENABLE_WARNING; } -#pragma GCC diagnostic pop -int main(int argc, char *argv[]) { - int r = EXIT_FAILURE; - char **files, **fn; - struct kmod_ctx *ctx; - const int probe_flags = KMOD_PROBE_APPLY_BLACKLIST|KMOD_PROBE_IGNORE_LOADED; +static int add_modules(const char *p) { + _cleanup_strv_free_ char **k = NULL; + + k = strv_split(p, ","); + if (!k) + return log_oom(); + + if (strv_extend_strv(&arg_proc_cmdline_modules, k) < 0) + return log_oom(); + + return 0; +} + +static int parse_proc_cmdline_item(const char *key, const char *value) { + int r; - if (argc > 1) { - log_error("This program takes no argument."); - return EXIT_FAILURE; + if (STR_IN_SET(key, "modules-load", "rd.modules-load") && value) { + r = add_modules(value); + if (r < 0) + return r; } - log_set_target(LOG_TARGET_AUTO); - log_parse_environment(); - log_open(); + return 0; +} - umask(0022); +static int load_module(struct kmod_ctx *ctx, const char *m) { + const int probe_flags = KMOD_PROBE_APPLY_BLACKLIST; + struct kmod_list *itr, *modlist = NULL; + int r = 0; - ctx = kmod_new(NULL, NULL); - if (!ctx) { - log_error("Failed to allocate memory for kmod."); - goto finish; + log_debug("load: %s", m); + + r = kmod_module_new_from_lookup(ctx, m, &modlist); + if (r < 0) + return log_error_errno(r, "Failed to lookup alias '%s': %m", m); + + if (!modlist) { + log_error("Failed to find module '%s'", m); + return -ENOENT; } - kmod_load_resources(ctx); + kmod_list_foreach(itr, modlist) { + struct kmod_module *mod; + int state, err; + + mod = kmod_module_get_module(itr); + state = kmod_module_get_initstate(mod); + + switch (state) { + case KMOD_MODULE_BUILTIN: + log_info("Module '%s' is builtin", kmod_module_get_name(mod)); + break; + + case KMOD_MODULE_LIVE: + log_debug("Module '%s' is already loaded", kmod_module_get_name(mod)); + break; + + default: + 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_errno(err, "Failed to insert '%s': %m", kmod_module_get_name(mod)); + r = err; + } + } - kmod_set_log_fn(ctx, systemd_kmod_log, NULL); + kmod_module_unref(mod); + } - 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; + kmod_module_unref_list(modlist); + + return r; +} + +static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent) { + _cleanup_fclose_ FILE *f = NULL; + int r; + + assert(ctx); + assert(path); + + r = search_and_fopen_nulstr(path, "re", NULL, conf_file_dirs, &f); + if (r < 0) { + if (ignore_enoent && r == -ENOENT) + return 0; + + return log_error_errno(r, "Failed to open %s, ignoring: %m", path); } - r = EXIT_SUCCESS; + log_debug("apply: %s", path); + for (;;) { + char line[LINE_MAX], *l; + int k; - STRV_FOREACH(fn, files) { - FILE *f; + if (!fgets(line, sizeof(line), f)) { + if (feof(f)) + break; - f = fopen(*fn, "re"); - if (!f) { - if (errno == ENOENT) - continue; + log_error_errno(errno, "Failed to read file '%s', ignoring: %m", path); + return -errno; + } - log_error("Failed to open %s: %m", *fn); - r = EXIT_FAILURE; + l = strstrip(line); + if (!*l) + continue; + if (strchr(COMMENTS "\n", *l)) continue; + + k = load_module(ctx, l); + if (k < 0 && r == 0) + r = k; + } + + return r; +} + +static void help(void) { + printf("%s [OPTIONS...] [CONFIGURATION FILE...]\n\n" + "Loads statically configured kernel modules.\n\n" + " -h --help Show this help\n" + " --version Show package version\n", + program_invocation_short_name); +} + +static int parse_argv(int argc, char *argv[]) { + + enum { + ARG_VERSION = 0x100, + }; + + static const struct option options[] = { + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, ARG_VERSION }, + {} + }; + + int c; + + assert(argc >= 0); + assert(argv); + + while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) + + switch (c) { + + case 'h': + help(); + return 0; + + case ARG_VERSION: + puts(PACKAGE_STRING); + puts(SYSTEMD_FEATURES); + return 0; + + case '?': + return -EINVAL; + + default: + assert_not_reached("Unhandled option"); } - log_debug("apply: %s\n", *fn); - for (;;) { - char line[LINE_MAX], *l; - struct kmod_list *itr, *modlist = NULL; - int err; + return 1; +} - if (!fgets(line, sizeof(line), f)) - break; +int main(int argc, char *argv[]) { + int r, k; + struct kmod_ctx *ctx; - l = strstrip(line); - if (*l == '#' || *l == 0) - continue; + r = parse_argv(argc, argv); + if (r <= 0) + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; - err = kmod_module_new_from_lookup(ctx, l, &modlist); - if (err < 0) { - log_error("Failed to lookup alias '%s'", l); - r = EXIT_FAILURE; - continue; - } + log_set_target(LOG_TARGET_AUTO); + log_parse_environment(); + log_open(); - kmod_list_foreach(itr, modlist) { - struct kmod_module *mod; + umask(0022); - mod = kmod_module_get_module(itr); - err = kmod_module_probe_insert_module(mod, probe_flags, - NULL, NULL, NULL, NULL); + r = parse_proc_cmdline(parse_proc_cmdline_item); + if (r < 0) + log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m"); - 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; - } + ctx = kmod_new(NULL, NULL); + if (!ctx) { + log_error("Failed to allocate memory for kmod."); + goto finish; + } - kmod_module_unref(mod); - } + kmod_load_resources(ctx); + kmod_set_log_fn(ctx, systemd_kmod_log, NULL); + + r = 0; - kmod_module_unref_list(modlist); + if (argc > optind) { + int i; + + for (i = optind; i < argc; i++) { + k = apply_file(ctx, argv[i], false); + if (k < 0 && r == 0) + r = k; } - if (ferror(f)) { - log_error("Failed to read from file: %m"); - r = EXIT_FAILURE; + } else { + _cleanup_free_ char **files = NULL; + char **fn, **i; + + STRV_FOREACH(i, arg_proc_cmdline_modules) { + k = load_module(ctx, *i); + if (k < 0 && r == 0) + r = k; } - fclose(f); + k = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs); + if (k < 0) { + log_error_errno(k, "Failed to enumerate modules-load.d files: %m"); + if (r == 0) + r = k; + goto finish; + } + + STRV_FOREACH(fn, files) { + k = apply_file(ctx, *fn, true); + if (k < 0 && r == 0) + r = k; + } } finish: - strv_free(files); kmod_unref(ctx); + strv_free(arg_proc_cmdline_modules); - return r; + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }