From 74df0fca09b3c31ed19e14ba80f996fdff772417 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 6 Nov 2013 03:15:16 +0100 Subject: 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. --- src/core/condition.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/core/condition.c') diff --git a/src/core/condition.c b/src/core/condition.c index c53d406682..436e7840d0 100644 --- a/src/core/condition.c +++ b/src/core/condition.c @@ -86,14 +86,11 @@ static bool test_kernel_command_line(const char *parameter) { assert(parameter); - if (detect_container(NULL) > 0) - return false; - - 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)); + if (r <= 0) return false; - } equal = !!strchr(parameter, '='); pl = strlen(parameter); -- cgit v1.2.3-54-g00ecf