summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-11-06 21:53:34 +0100
committerAnthony G. Basile <blueness@gentoo.org>2014-11-07 16:54:58 -0500
commit9db4dfff9ebe1f5fd1c4aa8c64d6d42b62c2576e (patch)
tree6629870d3cae28b9109bc27ad6f347fb3f31c238
parente9b029ac5361b5e1907f556988037108d1a2a141 (diff)
util: simplify proc_cmdline() to reuse get_process_cmdline()
Also, make all parsing of the kernel cmdline non-fatal. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-rw-r--r--src/udev/udevd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index a1ecf6512e..5090dfae37 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -988,10 +988,10 @@ static void kernel_cmdline_options(struct udev *udev) {
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;
+ }
FOREACH_WORD_QUOTED(word, l, line, state) {
char *s, *opt, *value;