#endif
;
-#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) {
+
+ DISABLE_WARNING_FORMAT_NONLITERAL;
log_metav(priority, 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;
struct kmod_list *itr, *modlist = NULL;
int r = 0;
- log_debug("load: %s\n", m);
+ log_debug("load: %s", m);
r = kmod_module_new_from_lookup(ctx, m, &modlist);
if (r < 0) {
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;
return r;
}
- log_debug("apply: %s\n", path);
+ log_debug("apply: %s", path);
for (;;) {
char line[LINE_MAX], *l;
int k;
umask(0022);
- if (parse_proc_cmdline() < 0)
+ if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
return EXIT_FAILURE;
ctx = kmod_new(NULL, NULL);
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("Failed to enumerate modules-load.d files: %s", strerror(-k));
+ if (r == 0)
+ r = k;
goto finish;
}