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/fstab-generator | |
| 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/fstab-generator')
| -rw-r--r-- | src/fstab-generator/fstab-generator.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 94cbc3a5fe..af45c25400 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -593,8 +593,9 @@ int main(int argc, char *argv[]) { umask(0022); - if (parse_proc_cmdline(parse_proc_cmdline_item) < 0) - return EXIT_FAILURE; + r = parse_proc_cmdline(parse_proc_cmdline_item); + if (r < 0) + log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-r)); /* Always honour root= and usr= in the kernel command line if we are in an initrd */ if (in_initrd()) { |