diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 00:42:49 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 00:42:49 -0500 |
| commit | ccef261c077d31dce02aa92e519b23b3a2a58303 (patch) | |
| tree | 582fafc98c76e98e912f453fb55ca57f29273d57 /src/modules-load/modules-load.c | |
| parent | 5d4922bba91c6d60b3b9f38fb29fda0f6ba8338d (diff) | |
| parent | 5fb2a20a29c2cc0494d5a31e175a8e3ff0b2d3e2 (diff) | |
Merge tag 'systemd/v232-4.parabola1' into systemd/parabola
Diffstat (limited to 'src/modules-load/modules-load.c')
| -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"); |