modules-load: use libkmod rather than modprobe

diff --git a/Makefile.am b/Makefile.am
index 2856fabc7515d0a85a909f7044c7c9fa5033912f..fbf23587bc791820664ab41885d368afb3c34c76 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -862,8 +862,12 @@ systemd_shutdown_LDADD = \
 systemd_modules_load_SOURCES = \
        src/modules-load.c
 
+systemd_modules_load_CFLAGS = \
+       $(KMOD_CFLAGS)
+
 systemd_modules_load_LDADD = \
-       libsystemd-basic.la
+       libsystemd-basic.la \
+       $(KMOD_LIBS)
 
 systemd_tmpfiles_SOURCES = \
        src/tmpfiles.c

diff --git a/TODO b/TODO
index 7d22ea0792224dab763ba4968a7f6987b7188753..b1c9ceb0af3b28d8aa2cabe1e4e168083039b3b0 100644 (file)
--- a/TODO
+++ b/TODO
@@ -23,8 +23,6 @@ Features:
 
 * if a journal file is corrupt, rotate it and create a new one
 
-* Port systemd-load-modules to libkmod
-
 * dbus: in fedora, make the machine a symlink to /etc/machine-id
 
 * journald: reuse XZ context

diff --git a/src/modules-load.c b/src/modules-load.c
index 7384f25ab040487e6aff3b37e05d11aaac226728..3adbd367ad6a36542b298be3232bc2d11bb0d3c1 100644 (file)
--- a/src/modules-load.c
+++ b/src/modules-load.c
@@ -26,16 +26,23 @@
 #include <sys/stat.h>
 #include <limits.h>
 #include <dirent.h>
+#include <libkmod.h>
 
 #include "log.h"
 #include "util.h"
 #include "strv.h"
 
+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);
+}
+
 int main(int argc, char *argv[]) {
         int r = EXIT_FAILURE;
-        char **arguments = NULL;
-        unsigned n_arguments = 0, n_allocated = 0;
         char **files, **fn;
+        struct kmod_ctx *ctx;
+        struct kmod_module *mod;
 
         if (argc > 1) {
                 log_error("This program takes no argument.");
@@ -48,12 +55,14 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-        if (!(arguments = strv_new("/sbin/modprobe", "-sab", "--", NULL))) {
-                log_error("Failed to allocate string array");
+        if (!(ctx = kmod_new(NULL, NULL))) {
+                log_error("Failed to allocate memory for kmod.");
                 goto finish;
         }
 
-        n_arguments = n_allocated = 3;
+        kmod_load_resources(ctx);
+
+        kmod_set_log_fn(ctx, systemd_kmod_log, NULL);
 
         if (conf_files_list(&files, ".conf",
                             "/run/modules-load.d",
@@ -83,7 +92,8 @@ int main(int argc, char *argv[]) {
 
                 log_debug("apply: %s\n", *fn);
                 for (;;) {
-                        char line[LINE_MAX], *l, *t;
+                        char line[LINE_MAX], *l;
+                        int err;
 
                         if (!(fgets(line, sizeof(line), f)))
                                 break;
@@ -92,52 +102,38 @@ int main(int argc, char *argv[]) {
                         if (*l == '#' || *l == 0)
                                 continue;
 
-                        if (!(t = strdup(l))) {
-                                log_error("Failed to allocate module name.");
+                        err = kmod_module_new_from_name(ctx, l, &mod);
+                        if (err < 0) {
+                                log_error("Failed to load module '%s'", l);
+                                r = EXIT_FAILURE;
                                 continue;
                         }
 
-                        if (n_arguments >= n_allocated) {
-                                char **a;
-                                unsigned m;
-
-                                m = MAX(16U, n_arguments*2);
-
-                                if (!(a = realloc(arguments, sizeof(char*) * (m+1)))) {
-                                        log_error("Failed to increase module array size.");
-                                        free(t);
-                                        r = EXIT_FAILURE;
-                                        continue;
-                                }
-
-                                arguments = a;
-                                n_allocated = m;
+                        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;
                         }
 
-                        arguments[n_arguments++] = t;
+                        kmod_module_unref(mod);
                 }
 
                 if (ferror(f)) {
-                        r = EXIT_FAILURE;
                         log_error("Failed to read from file: %m");
+                        r = EXIT_FAILURE;
                 }
 
                 fclose(f);
         }
 
-        strv_free(files);
 finish:
-
-        if (n_arguments > 3) {
-                arguments[n_arguments] = NULL;
-                strv_uniq(arguments);
-                execv("/sbin/modprobe", arguments);
-
-                log_error("Failed to execute /sbin/modprobe: %m");
-                r = EXIT_FAILURE;
-        }
-
-        strv_free(arguments);
+        strv_free(files);
+        kmod_unref(ctx);
 
         return r;
 }