X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=blobdiff_plain;f=src%2Fmodules-load%2Fmodules-load.c;h=4dbacd13dc3a3b0359aa0607e0ece8d8f425c37d;hp=5d141a893526190d4cc9e604536bc87a856bde6f;hb=8d3d7072e609ef0e0fb37e1d19a29307d58146c3;hpb=9f6445e34a57c270f013c9416c123e56261553dd diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c index 5d141a89352..4dbacd13dc3 100644 --- a/src/modules-load/modules-load.c +++ b/src/modules-load/modules-load.c @@ -38,76 +38,36 @@ static char **arg_proc_cmdline_modules = NULL; -static const char conf_file_dirs[] = - "/etc/modules-load.d\0" - "/run/modules-load.d\0" - "/usr/local/lib/modules-load.d\0" - "/usr/lib/modules-load.d\0" -#ifdef HAVE_SPLIT_USR - "/lib/modules-load.d\0" -#endif - ; - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-nonliteral" +static const char conf_file_dirs[] = CONF_DIRS_NULSTR("modules-load"); + static void systemd_kmod_log(void *data, int priority, const char *file, int line, const char *fn, const char *format, va_list args) { - log_metav(priority, file, line, fn, format, args); + + DISABLE_WARNING_FORMAT_NONLITERAL; + log_internalv(priority, 0, file, line, fn, format, args); + REENABLE_WARNING; } -#pragma GCC diagnostic pop static int add_modules(const char *p) { - char **t; _cleanup_strv_free_ char **k = NULL; k = strv_split(p, ","); if (!k) return log_oom(); - t = strv_merge(arg_proc_cmdline_modules, k); - if (!t) + if (strv_extend_strv(&arg_proc_cmdline_modules, k) < 0) return log_oom(); - strv_free(arg_proc_cmdline_modules); - arg_proc_cmdline_modules = t; - return 0; } -static int parse_proc_cmdline(void) { - _cleanup_free_ char *line = NULL; - char *w, *state; - size_t l; +static int parse_proc_cmdline_item(const char *key, const char *value) { int r; - r = proc_cmdline(&line); - if (r < 0) - log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); - if (r <= 0) - return 0; - - FOREACH_WORD_QUOTED(w, l, line, state) { - _cleanup_free_ char *word; - - word = strndup(w, l); - if (!word) - return log_oom(); - - if (startswith(word, "modules-load=")) { - - r = add_modules(word + 13); - if (r < 0) - return r; - - } else if (startswith(word, "rd.modules-load=")) { - - if (in_initrd()) { - r = add_modules(word + 16); - if (r < 0) - return r; - } - - } + if (STR_IN_SET(key, "modules-load", "rd.modules-load") && value) { + r = add_modules(value); + if (r < 0) + return r; } return 0; @@ -121,10 +81,8 @@ static int load_module(struct kmod_ctx *ctx, const char *m) { log_debug("load: %s", m); r = kmod_module_new_from_lookup(ctx, m, &modlist); - if (r < 0) { - log_error("Failed to lookup alias '%s': %s", m, strerror(-r)); - return r; - } + 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); @@ -156,8 +114,7 @@ static int load_module(struct kmod_ctx *ctx, const char *m) { 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)); + log_error_errno(err, "Failed to insert '%s': %m", kmod_module_get_name(mod)); r = err; } } @@ -177,13 +134,12 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent assert(ctx); assert(path); - r = search_and_fopen_nulstr(path, "re", conf_file_dirs, &f); + r = search_and_fopen_nulstr(path, "re", NULL, conf_file_dirs, &f); if (r < 0) { if (ignore_enoent && r == -ENOENT) return 0; - log_error("Failed to open %s, ignoring: %s", path, strerror(-r)); - return r; + return log_error_errno(r, "Failed to open %s, ignoring: %m", path); } log_debug("apply: %s", path); @@ -213,15 +169,12 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent return r; } -static int help(void) { - +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); - - return 0; } static int parse_argv(int argc, char *argv[]) { @@ -241,12 +194,13 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) switch (c) { case 'h': - return help(); + help(); + return 0; case ARG_VERSION: puts(PACKAGE_STRING); @@ -259,7 +213,6 @@ static int parse_argv(int argc, char *argv[]) { default: assert_not_reached("Unhandled option"); } - } return 1; } @@ -278,8 +231,9 @@ int main(int argc, char *argv[]) { umask(0022); - if (parse_proc_cmdline() < 0) - return EXIT_FAILURE; + r = parse_proc_cmdline(parse_proc_cmdline_item); + if (r < 0) + log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m"); ctx = kmod_new(NULL, NULL); if (!ctx) { @@ -311,9 +265,11 @@ int main(int argc, char *argv[]) { r = k; } - r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs); - if (r < 0) { - log_error("Failed to enumerate modules-load.d files: %s", strerror(-r)); + 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; }