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.
This commit is contained in:
Lennart Poettering
2013-11-06 03:15:16 +01:00
parent 1f0cd86b3d
commit 74df0fca09
15 changed files with 94 additions and 103 deletions
+4 -8
View File
@@ -35,7 +35,6 @@
#include "bus-util.h"
#include "bus-error.h"
#include "bus-errors.h"
#include "virt.h"
#include "fileio.h"
#include "udev-util.h"
@@ -75,17 +74,14 @@ static void start_target(const char *target) {
static int parse_proc_cmdline(void) {
char *line, *w, *state;
int r;
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) {