diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-11-06 21:53:34 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-11-07 01:19:56 +0100 |
| commit | b5884878a2874447b2a9f07f324a7cd909d96d48 (patch) | |
| tree | 7187916b29404dad30f53be8ed0393a095571e0d /src/journal | |
| parent | f2997962ff8aeea577bed878d3bc4e4f64784e45 (diff) | |
util: simplify proc_cmdline() to reuse get_process_cmdline()
Also, make all parsing of the kernel cmdline non-fatal.
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/journald-server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 2f782f245..62ae79a5c 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1310,10 +1310,10 @@ static int server_parse_proc_cmdline(Server *s) { int r; r = proc_cmdline(&line); - if (r < 0) + if (r < 0) { log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); - if (r <= 0) return 0; + } FOREACH_WORD_QUOTED(w, l, line, state) { _cleanup_free_ char *word; |