summaryrefslogtreecommitdiff
path: root/src/modules-load
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2016-11-03 20:50:01 +0200
committerMartin Pitt <martin.pitt@ubuntu.com>2016-11-03 20:50:01 +0200
commit8a584da2774aca0b14c8aacef574e93d943d470e (patch)
tree9ba19deb6acaab9794edb3d19b235375bfdb3e60 /src/modules-load
parent5a920b42cee79747f6aa8e26abd6998401de0d61 (diff)
downloadsystemd-8a584da2774aca0b14c8aacef574e93d943d470e.tar.gz
Imported Upstream version 232
Diffstat (limited to 'src/modules-load')
-rw-r--r--src/modules-load/modules-load.c6
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");