diff options
author | Lennart Poettering <lennart@poettering.net> | 2013-11-06 03:15:16 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2013-11-06 03:15:16 +0100 |
commit | 74df0fca09b3c31ed19e14ba80f996fdff772417 (patch) | |
tree | 6910dfb512fa634c8e65a5c938f24d4dc133d716 /src/udev/net | |
parent | 1f0cd86b3dc0f938ce179cdddc62fc0f584e599d (diff) |
util: unify reading of /proc/cmdline
Instead of individually checking for containers in each user do this
once in a new call proc_cmdline() that read the file only if we are not
in a container.
Diffstat (limited to 'src/udev/net')
-rw-r--r-- | src/udev/net/link-config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index 9d0f23694c..726945816d 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -195,11 +195,11 @@ static bool enable_name_policy(void) { int r; size_t l; - r = read_one_line_file("/proc/cmdline", &line); - if (r < 0) { + r = proc_cmdline(&line); + if (r < 0) log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); - return true; /* something is very wrong, let's not make it worse */ - } + if (r <= 0) + return true; FOREACH_WORD_QUOTED(w, l, line, state) if (strneq(w, "net.ifnames=0", l)) |