summaryrefslogtreecommitdiff
path: root/src/modules-load/modules-load.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-03-06 17:05:55 +0100
committerLennart Poettering <lennart@poettering.net>2014-03-06 18:48:22 +0100
commit059cb3858acd038ff2cef10a3a99119bf71a8fc6 (patch)
tree065a3a0c911856a6a02ab8f128890970b75bcb95 /src/modules-load/modules-load.c
parent27d14fb331ba8144f99f4da2d13f15cf5c8b8a9f (diff)
util: move more intellegince into parse_proc_cmdline()
Already split variable assignments before invoking the callback. And drop "rd." settings if we are not in an initrd.
Diffstat (limited to 'src/modules-load/modules-load.c')
-rw-r--r--src/modules-load/modules-load.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index 37d7a77068..49b153d411 100644
--- 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;
}
-static int parse_proc_cmdline_word(const char *word) {
+static int parse_proc_cmdline_item(const char *key, const char *value) {
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;
-
- } else if (startswith(word, "rd.modules-load=")) {
- if (in_initrd()) {
- r = add_modules(word + 16);
- if (r < 0)
- return r;
- }
}
return 0;
@@ -253,7 +246,7 @@ int main(int argc, char *argv[]) {
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);