#include "util.h"
#include "strv.h"
#include "conf-files.h"
-#include "virt.h"
+#include "fileio.h"
+#include "build.h"
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);
+ 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
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) {
- char _cleanup_free_ *line = NULL;
- char *w, *state;
+static int parse_proc_cmdline_item(const char *key, const char *value) {
int r;
- size_t l;
-
- if (detect_container(NULL) > 0)
- return 0;
-
- r = read_one_line_file("/proc/cmdline", &line);
- if (r < 0) {
- log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
- return 0;
- }
-
- FOREACH_WORD_QUOTED(w, l, line, state) {
- char _cleanup_free_ *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) {
- 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);
break;
case KMOD_MODULE_LIVE:
- log_info("Module '%s' is already loaded", kmod_module_get_name(mod));
+ log_debug("Module '%s' is already loaded", kmod_module_get_name(mod));
break;
default:
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;
}
}
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\n", path);
+ log_debug("apply: %s", path);
for (;;) {
char line[LINE_MAX], *l;
int k;
if (feof(f))
break;
- log_error("Failed to read file '%s', ignoring: %m", path);
+ log_error_errno(errno, "Failed to read file '%s', ignoring: %m", path);
return -errno;
}
l = strstrip(line);
if (!*l)
continue;
- if (strchr(COMMENTS, *l))
+ if (strchr(COMMENTS "\n", *l))
continue;
k = load_module(ctx, l);
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",
+ " -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[]) {
+ enum {
+ ARG_VERSION = 0x100,
+ };
+
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
- { NULL, 0, NULL, 0 }
+ { "version", no_argument, NULL, ARG_VERSION },
+ {}
};
int c;
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) {
help();
return 0;
+ case ARG_VERSION:
+ puts(PACKAGE_STRING);
+ puts(SYSTEMD_FEATURES);
+ return 0;
+
case '?':
return -EINVAL;
default:
- log_error("Unknown option code %c", c);
- return -EINVAL;
+ assert_not_reached("Unhandled option");
}
- }
return 1;
}
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) {
STRV_FOREACH(i, arg_proc_cmdline_modules) {
k = load_module(ctx, *i);
- if (k < 0)
- r = EXIT_FAILURE;
+ if (k < 0 && r == 0)
+ 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;
}
~ianmdlvl / elogind.git / blobdiff