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=e73ba7f2418a14b73c464e0234e5381933633475;hb=75e52a16f9ef476f1d18ec6d9c84e00149b80d03;hpb=669241a076108e0483d7d8475beaa506106d077e

diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index e73ba7f24..5f678789c 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -26,94 +26,51 @@
 #include <sys/stat.h>
 #include <limits.h>
 #include <dirent.h>
+#include <getopt.h>
 #include <libkmod.h>
 
 #include "log.h"
 #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;
 
-#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, **k;
+        _cleanup_strv_free_ char **k = NULL;
 
         k = strv_split(p, ",");
-        if (!k) {
-                log_error("Out of memory.");
-                return -ENOMEM;
-        }
-
-        t = strv_merge(arg_proc_cmdline_modules, k);
-        strv_free(k);
-        if (!t) {
-                log_error("Out of memory.");
-                return -ENOMEM;
-        }
+        if (!k)
+                return log_oom();
 
-        strv_free(arg_proc_cmdline_modules);
-        arg_proc_cmdline_modules = t;
+        if (strv_extend_strv(&arg_proc_cmdline_modules, k) < 0)
+                return log_oom();
 
         return 0;
 }
 
-static int parse_proc_cmdline(void) {
-        char *line, *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 *word;
-
-                word = strndup(w, l);
-                if (!word) {
-                        r = -ENOMEM;
-                        goto finish;
-                }
-
-                if (startswith(word, "modules-load=")) {
-
-                        r = add_modules(word + 13);
-                        if (r < 0)
-                                goto finish;
-
-                } else if (startswith(word, "rd.modules-load=")) {
-
-                        if (in_initrd()) {
-                                r = add_modules(word + 16);
-                                if (r < 0)
-                                        goto finish;
-                        }
-
-                }
 
-                free(word);
+        if (STR_IN_SET(key, "modules-load", "rd.modules-load") && value) {
+                r = add_modules(value);
+                if (r < 0)
+                        return r;
         }
 
-        r = 0;
-
-finish:
-        free(line);
-        return r;
+        return 0;
 }
 
 static int load_module(struct kmod_ctx *ctx, const char *m) {
@@ -121,13 +78,11 @@ static int load_module(struct kmod_ctx *ctx, const char *m) {
         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);
@@ -147,7 +102,7 @@ static int load_module(struct kmod_ctx *ctx, const char *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:
@@ -159,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;
                         }
                 }
@@ -173,15 +127,103 @@ static int load_module(struct kmod_ctx *ctx, const char *m) {
         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);
+        }
+
+        log_debug("apply: %s", path);
+        for (;;) {
+                char line[LINE_MAX], *l;
+                int k;
+
+                if (!fgets(line, sizeof(line), f)) {
+                        if (feof(f))
+                                break;
+
+                        log_error_errno(errno, "Failed to read file '%s', ignoring: %m", path);
+                        return -errno;
+                }
+
+                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");
+                }
+
+        return 1;
+}
+
 int main(int argc, char *argv[]) {
-        int r = EXIT_FAILURE, k;
-        char **files, **fn, **i;
+        int r, k;
         struct kmod_ctx *ctx;
 
-        if (argc > 1) {
-                log_error("This program takes no argument.");
-                return EXIT_FAILURE;
-        }
+        r = parse_argv(argc, argv);
+        if (r <= 0)
+                return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 
         log_set_target(LOG_TARGET_AUTO);
         log_parse_environment();
@@ -189,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) {
@@ -201,70 +244,45 @@ int main(int argc, char *argv[]) {
         kmod_load_resources(ctx);
         kmod_set_log_fn(ctx, systemd_kmod_log, NULL);
 
-        r = EXIT_SUCCESS;
-
-        STRV_FOREACH(i, arg_proc_cmdline_modules) {
-                k = load_module(ctx, *i);
-                if (k < 0)
-                        r = EXIT_FAILURE;
-        }
-
-        k = 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);
-        if (k < 0) {
-                log_error("Failed to enumerate modules-load.d files: %s", strerror(-k));
-                r = EXIT_FAILURE;
-                goto finish;
-        }
-
-        STRV_FOREACH(fn, files) {
-                FILE *f;
+        r = 0;
 
-                f = fopen(*fn, "re");
-                if (!f) {
-                        if (errno == ENOENT)
-                                continue;
+        if (argc > optind) {
+                int i;
 
-                        log_error("Failed to open %s: %m", *fn);
-                        r = EXIT_FAILURE;
-                        continue;
+                for (i = optind; i < argc; i++) {
+                        k = apply_file(ctx, argv[i], false);
+                        if (k < 0 && r == 0)
+                                r = k;
                 }
 
-                log_debug("apply: %s\n", *fn);
-                for (;;) {
-                        char line[LINE_MAX], *l;
-
-                        if (!fgets(line, sizeof(line), f))
-                                break;
-
-                        l = strstrip(line);
-                        if (*l == '#' || *l == 0)
-                                continue;
+        } else {
+                _cleanup_free_ char **files = NULL;
+                char **fn, **i;
 
-                        k = load_module(ctx, l);
-                        if (k < 0)
-                                r = EXIT_FAILURE;
+                STRV_FOREACH(i, arg_proc_cmdline_modules) {
+                        k = load_module(ctx, *i);
+                        if (k < 0 && r == 0)
+                                r = k;
                 }
 
-                if (ferror(f)) {
-                        log_error("Failed to read from file: %m");
-                        r = EXIT_FAILURE;
+                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;
                 }
 
-                fclose(f);
+                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;
 }