chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machined: allow registering host-side network interfaces for communication with conta...
[elogind.git]
/
src
/
modules-load
/
modules-load.c
diff --git
a/src/modules-load/modules-load.c
b/src/modules-load/modules-load.c
index 37d7a77068c6d81628652b71e9a349f5ceed4ec1..ecb84da6d733efdab36f2827a415a38284f6cea1 100644
(file)
--- a/
src/modules-load/modules-load.c
+++ b/
src/modules-load/modules-load.c
@@
-69,20
+69,13
@@
static int add_modules(const char *p) {
return 0;
}
return 0;
}
-static int parse_proc_cmdline_
word(const char *word
) {
+static int parse_proc_cmdline_
item(const char *key, const char *value
) {
int r;
int r;
- if (
startswith(word, "modules-load=")
) {
- r = add_modules(
word + 13
);
+ if (
STR_IN_SET(key, "modules-load", "rd.modules-load") && value
) {
+ r = add_modules(
value
);
if (r < 0)
return r;
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;
- }
}
return 0;
}
return 0;
@@
-152,7
+145,7
@@
static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent
assert(ctx);
assert(path);
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;
if (r < 0) {
if (ignore_enoent && r == -ENOENT)
return 0;
@@
-253,7
+246,7
@@
int main(int argc, char *argv[]) {
umask(0022);
umask(0022);
- if (parse_proc_cmdline(parse_proc_cmdline_
word
) < 0)
+ if (parse_proc_cmdline(parse_proc_cmdline_
item
) < 0)
return EXIT_FAILURE;
ctx = kmod_new(NULL, NULL);
return EXIT_FAILURE;
ctx = kmod_new(NULL, NULL);