chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: allow deletion of temporary files from normal fs
[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 1b887aea3f63336444ba0be5c1fd242e850843dc..6aeaf459aff0d65e837b4072ce6cfc006c959336 100644
(file)
--- a/
src/modules-load/modules-load.c
+++ b/
src/modules-load/modules-load.c
@@
-49,17
+49,13
@@
static int add_modules(const char *p) {
char **t, **k;
k = strv_split(p, ",");
char **t, **k;
k = strv_split(p, ",");
- if (!k) {
- log_error("Out of memory");
- return -ENOMEM;
- }
+ if (!k)
+ return log_oom();
t = strv_merge(arg_proc_cmdline_modules, k);
strv_free(k);
t = strv_merge(arg_proc_cmdline_modules, k);
strv_free(k);
- if (!t) {
- log_error("Out of memory");
- return -ENOMEM;
- }
+ if (!t)
+ return log_oom();
strv_free(arg_proc_cmdline_modules);
arg_proc_cmdline_modules = t;
strv_free(arg_proc_cmdline_modules);
arg_proc_cmdline_modules = t;
@@
-90,16
+86,16
@@
static int parse_proc_cmdline(void) {
goto finish;
}
goto finish;
}
- if (startswith(word, "
driver
=")) {
+ if (startswith(word, "
modules-load
=")) {
- r = add_modules(word +
7
);
+ r = add_modules(word +
13
);
if (r < 0)
goto finish;
if (r < 0)
goto finish;
- } else if (startswith(word, "rd.
driver
=")) {
+ } else if (startswith(word, "rd.
modules-load
=")) {
if (in_initrd()) {
if (in_initrd()) {
- r = add_modules(word + 1
0
);
+ r = add_modules(word + 1
6
);
if (r < 0)
goto finish;
}
if (r < 0)
goto finish;
}