summaryrefslogtreecommitdiff
path: root/src/quotacheck
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-11-06 03:15:16 +0100
committerLennart Poettering <lennart@poettering.net>2013-11-06 03:15:16 +0100
commit74df0fca09b3c31ed19e14ba80f996fdff772417 (patch)
tree6910dfb512fa634c8e65a5c938f24d4dc133d716 /src/quotacheck
parent1f0cd86b3dc0f938ce179cdddc62fc0f584e599d (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/quotacheck')
-rw-r--r--src/quotacheck/quotacheck.c10
1 files changed, 3 insertions, 7 deletions
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 <unistd.h>
#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) {