shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

modules-load: use libkmod rather than modprobe

Browse Source
This commit is contained in:
Tom Gundersen 2012-02-08 21:52:19 +01:00 committed by Lennart Poettering
parent 728beb28a7
commit 83684a3553
3 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -862,8 +862,12 @@ systemd_shutdown_LDADD = \
systemd_modules_load_SOURCES = \ systemd_modules_load_SOURCES = \
src/modules-load.c src/modules-load.c
systemd_modules_load_CFLAGS = \
$(KMOD_CFLAGS)
systemd_modules_load_LDADD = \ systemd_modules_load_LDADD = \
libsystemd-basic.la libsystemd-basic.la \
$(KMOD_LIBS)
systemd_tmpfiles_SOURCES = \ systemd_tmpfiles_SOURCES = \
src/tmpfiles.c src/tmpfiles.c

2
TODO
View File

@ -23,8 +23,6 @@ Features:
* if a journal file is corrupt, rotate it and create a new one * 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 * dbus: in fedora, make the machine a symlink to /etc/machine-id
* journald: reuse XZ context * journald: reuse XZ context

70
src/modules-load.c
View File

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