X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ffsck%2Ffsck.c;h=9b67ccfc0e278527c47abc64132f881effcb94cf;hb=74df0fca09b3c31ed19e14ba80f996fdff772417;hp=10c968678b365fc5dc23ede1a3a7dac17d98d98f;hpb=1f0cd86b3dc0f938ce179cdddc62fc0f584e599d;p=elogind.git diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index 10c968678..9b67ccfc0 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -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) {