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/core | |
| parent | f2997962ff8aeea577bed878d3bc4e4f64784e45 (diff) | |
| download | systemd-b5884878a2874447b2a9f07f324a7cd909d96d48.tar.gz | |
util: simplify proc_cmdline() to reuse get_process_cmdline()
Also, make all parsing of the kernel cmdline non-fatal.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/kmod-setup.c | 2 | ||||
| -rw-r--r-- | src/core/main.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c index 2f3f608830..38e1726e08 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -47,7 +47,7 @@ static void systemd_kmod_log( static bool cmdline_check_kdbus(void) { _cleanup_free_ char *line = NULL; - if (proc_cmdline(&line) <= 0) + if (proc_cmdline(&line) < 0) return false; return strstr(line, "kdbus") != NULL; diff --git a/src/core/main.c b/src/core/main.c index d48604e673..56a1f6193c 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1402,9 +1402,11 @@ int main(int argc, char *argv[]) { if (parse_config_file() < 0) goto finish; - if (arg_running_as == SYSTEMD_SYSTEM) - if (parse_proc_cmdline(parse_proc_cmdline_item) < 0) - goto finish; + if (arg_running_as == SYSTEMD_SYSTEM) { + r = parse_proc_cmdline(parse_proc_cmdline_item); + if (r < 0) + log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-r)); + } /* Note that this also parses bits from the kernel command * line, including "debug". */ |