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/basic/log.c | |
| parent | 9b3313d678a4f666e9ddc086a8e92652c9294411 (diff) | |
| parent | d7f69e16f1a5b84e9acf1771a9b53da3787ae79d (diff) | |
Merge pull request #4459 from keszybz/commandline-parsing
Commandline parsing simplification and udev fix
Diffstat (limited to 'src/basic/log.c')
| -rw-r--r-- | src/basic/log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/basic/log.c b/src/basic/log.c index bd6c96c4f8..2ff70be255 100644 --- a/src/basic/log.c +++ b/src/basic/log.c @@ -967,7 +967,7 @@ int log_set_max_level_from_string(const char *e) { 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) { /* * The systemd.log_xyz= settings are parsed by all tools, and @@ -1012,7 +1012,7 @@ void log_parse_environment(void) { /* Only try to read the command line in daemons. We assume that anything that has a controlling tty is user stuff. */ - (void) parse_proc_cmdline(parse_proc_cmdline_item); + (void) parse_proc_cmdline(parse_proc_cmdline_item, NULL, true); e = secure_getenv("SYSTEMD_LOG_TARGET"); if (e && log_set_target_from_string(e) < 0) |