X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmodules-load.c;h=0f2144c2ed84b853e6df14dfc037f3c74796afe2;hp=3adbd367ad6a36542b298be3232bc2d11bb0d3c1;hb=90ccc3fca7e53a60a9e67b9d5812e1d4a27fc07d;hpb=83684a3553cd875d6873b3dc867e6cd1a7cc4173

diff --git a/src/modules-load.c b/src/modules-load.c
index 3adbd367a..0f2144c2e 100644
--- a/src/modules-load.c
+++ b/src/modules-load.c
@@ -6,16 +6,16 @@
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
@@ -32,17 +32,20 @@
 #include "util.h"
 #include "strv.h"
 
+#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);
 }
+#pragma GCC diagnostic pop
 
 int main(int argc, char *argv[]) {
         int r = EXIT_FAILURE;
         char **files, **fn;
         struct kmod_ctx *ctx;
-        struct kmod_module *mod;
+        const int probe_flags = KMOD_PROBE_APPLY_BLACKLIST|KMOD_PROBE_IGNORE_LOADED;
 
         if (argc > 1) {
                 log_error("This program takes no argument.");
@@ -55,7 +58,8 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-        if (!(ctx = kmod_new(NULL, NULL))) {
+        ctx = kmod_new(NULL, NULL);
+        if (!ctx) {
                 log_error("Failed to allocate memory for kmod.");
                 goto finish;
         }
@@ -65,11 +69,13 @@ int main(int argc, char *argv[]) {
         kmod_set_log_fn(ctx, systemd_kmod_log, NULL);
 
         if (conf_files_list(&files, ".conf",
-                            "/run/modules-load.d",
                             "/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;
@@ -93,34 +99,44 @@ int main(int argc, char *argv[]) {
                 log_debug("apply: %s\n", *fn);
                 for (;;) {
                         char line[LINE_MAX], *l;
+                        struct kmod_list *itr, *modlist = NULL;
                         int err;
 
-                        if (!(fgets(line, sizeof(line), f)))
+                        if (!fgets(line, sizeof(line), f))
                                 break;
 
                         l = strstrip(line);
                         if (*l == '#' || *l == 0)
                                 continue;
 
-                        err = kmod_module_new_from_name(ctx, l, &mod);
+                        err = kmod_module_new_from_lookup(ctx, l, &modlist);
                         if (err < 0) {
-                                log_error("Failed to load module '%s'", l);
+                                log_error("Failed to lookup alias '%s'", l);
                                 r = EXIT_FAILURE;
                                 continue;
                         }
 
-                        err = kmod_module_probe_insert_module(mod, KMOD_PROBE_APPLY_BLACKLIST,
-                                                              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("Failed to insert '%s'", kmod_module_get_name(mod));
-                                r = EXIT_FAILURE;
+                        kmod_list_foreach(itr, modlist) {
+                                struct kmod_module *mod;
+
+                                mod = kmod_module_get_module(itr);
+                                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("Failed to insert '%s': %s", kmod_module_get_name(mod),
+                                                        strerror(-err));
+                                        r = EXIT_FAILURE;
+                                }
+
+                                kmod_module_unref(mod);
                         }
 
-                        kmod_module_unref(mod);
+                        kmod_module_unref_list(modlist);
                 }
 
                 if (ferror(f)) {