#include "mount-setup.h"
#include "special.h"
#include "mkdir.h"
-#include "virt.h"
#include "fileio.h"
static const char *arg_dest = "/tmp";
static int parse_new_root_from_proc_cmdline(void) {
_cleanup_free_ char *what = NULL, *type = NULL, *opts = NULL, *line = NULL;
+ bool noauto, nofail;
char *w, *state;
- int r;
size_t l;
- bool noauto, nofail;
+ int r;
- r = read_one_line_file("/proc/cmdline", &line);
- if (r < 0) {
- log_error("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+ r = proc_cmdline(&line);
+ if (r < 0)
+ log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+ if (r <= 0)
return 0;
- }
opts = strdup("ro");
type = strdup("auto");
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 = NULL;