X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ffstab-generator%2Ffstab-generator.c;h=bfeddedf6228138ef99b98d964dfdecf210cc7ca;hb=47a0eaa60cb5434d13f0acbe048aa4681bc8b8a8;hp=f3ecc24be62e864a67c15d7ea0fa112a7867c95a;hpb=d0aa9ce51915f6f7448adfeb4be0f46cc1356124;p=elogind.git diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index f3ecc24be..bfeddedf6 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -33,6 +33,7 @@ #include "special.h" #include "mkdir.h" #include "virt.h" +#include "fileio.h" static const char *arg_dest = "/tmp"; static bool arg_enabled = true; @@ -451,8 +452,8 @@ static int parse_new_root_from_proc_cmdline(void) { if (!opts || !type) return log_oom(); - /* root= and roofstype= may occur more than once, the last instance should take precedence. - * In the case of multiple rootflags= the arguments should be concatenated */ + /* root= and roofstype= may occur more than once, the last instance should take precedence. + * In the case of multiple rootflags= the arguments should be concatenated */ FOREACH_WORD_QUOTED(w, l, line, state) { char *word, *tmp_word; @@ -494,8 +495,8 @@ static int parse_new_root_from_proc_cmdline(void) { if (what) { - log_debug("Found entry what=%s where=/new_root type=%s", what, type); - r = add_mount(what, "/new_root", type, opts, 0, wait, false, false, + log_debug("Found entry what=%s where=/sysroot type=%s", what, type); + r = add_mount(what, "/sysroot", type, opts, 0, wait, false, false, false, false, false, "/proc/cmdline"); if (r < 0)