diff options
author | Lennart Poettering <lennart@poettering.net> | 2016-10-24 17:20:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-24 17:20:37 +0200 |
commit | 229ba9fd57942fb7d1bb738ab1ad21356431d952 (patch) | |
tree | 8ac955e41a5b655d64b594b684bc9b0d3c5021e7 /src/modules-load | |
parent | 9b3313d678a4f666e9ddc086a8e92652c9294411 (diff) | |
parent | d7f69e16f1a5b84e9acf1771a9b53da3787ae79d (diff) |
Merge pull request #4459 from keszybz/commandline-parsing
Commandline parsing simplification and udev fix
Diffstat (limited to 'src/modules-load')
-rw-r--r-- | src/modules-load/modules-load.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c index f75015d8c3..0901fea8dc 100644 --- a/src/modules-load/modules-load.c +++ b/src/modules-load/modules-load.c @@ -59,10 +59,10 @@ static int add_modules(const char *p) { return 0; } -static int parse_proc_cmdline_item(const char *key, const char *value) { +static int parse_proc_cmdline_item(const char *key, const char *value, void *data) { int r; - if (STR_IN_SET(key, "modules-load", "rd.modules-load") && value) { + if (streq(key, "modules-load") && value) { r = add_modules(value); if (r < 0) return r; @@ -226,7 +226,7 @@ int main(int argc, char *argv[]) { umask(0022); - r = parse_proc_cmdline(parse_proc_cmdline_item); + r = parse_proc_cmdline(parse_proc_cmdline_item, NULL, true); if (r < 0) log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m"); |