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/quotacheck/quotacheck.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/quotacheck') diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c index 1f63785041..622952a6e9 100644 --- a/src/quotacheck/quotacheck.c +++ b/src/quotacheck/quotacheck.c @@ -26,7 +26,6 @@ #include #include "util.h" -#include "virt.h" #include "fileio.h" static bool arg_skip = false; @@ -38,14 +37,11 @@ static int parse_proc_cmdline(void) { size_t l; int r; - if (detect_container(NULL) > 0) - return 0; - - 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 0; - } FOREACH_WORD_QUOTED(w, l, line, state) { -- cgit v1.2.3-54-g00ecf