summaryrefslogtreecommitdiff
path: root/src/modules-load
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/modules-load
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/modules-load')
-rw-r--r--src/modules-load/modules-load.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index 49ee4203dd..7772e3dc2a 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -33,7 +33,6 @@
#include "util.h"
#include "strv.h"
#include "conf-files.h"
-#include "virt.h"
#include "fileio.h"
static char **arg_proc_cmdline_modules = NULL;
@@ -78,17 +77,14 @@ static int add_modules(const char *p) {
static int parse_proc_cmdline(void) {
_cleanup_free_ char *line = NULL;
char *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) {
_cleanup_free_ char *word;