From b5884878a2874447b2a9f07f324a7cd909d96d48 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 6 Nov 2014 21:53:34 +0100 Subject: util: simplify proc_cmdline() to reuse get_process_cmdline() Also, make all parsing of the kernel cmdline non-fatal. --- src/udev/net/link-config.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/udev/net/link-config.c') diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index 428a71dce3..5aefb7d415 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -174,11 +174,10 @@ static bool enable_name_policy(void) { size_t l; r = proc_cmdline(&line); - if (r < 0) - log_warning("Failed to read /proc/cmdline, ignoring: %s", - strerror(-r)); - if (r <= 0) + if (r < 0) { + log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); return true; + } FOREACH_WORD_QUOTED(word, l, line, state) if (strneq(word, "net.ifnames=0", l)) -- cgit v1.2.3-54-g00ecf