summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-10-24 17:20:37 +0200
committerGitHub <noreply@github.com>2016-10-24 17:20:37 +0200
commit229ba9fd57942fb7d1bb738ab1ad21356431d952 (patch)
tree8ac955e41a5b655d64b594b684bc9b0d3c5021e7 /src/core
parent9b3313d678a4f666e9ddc086a8e92652c9294411 (diff)
parentd7f69e16f1a5b84e9acf1771a9b53da3787ae79d (diff)
Merge pull request #4459 from keszybz/commandline-parsing
Commandline parsing simplification and udev fix
Diffstat (limited to 'src/core')
-rw-r--r--src/core/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/main.c b/src/core/main.c
index 498e289a83..94602611a7 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -308,7 +308,7 @@ static int set_machine_id(const char *m) {
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;
@@ -1569,7 +1569,7 @@ int main(int argc, char *argv[]) {
}
if (arg_system) {
- r = parse_proc_cmdline(parse_proc_cmdline_item);
+ r = parse_proc_cmdline(parse_proc_cmdline_item, NULL, false);
if (r < 0)
log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
}