X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ffstab-generator%2Ffstab-generator.c;h=9db4123530096f5d3be656d7f4ba22a75026234f;hp=ad26acb14a526466404d5592341bf46a113faa50;hb=3f8ee7918207d7128d4edbc20a1e81f4c6e1110e;hpb=a5c32cff1f56afe6f0c6c70d91a88a7a8238b2d7 diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index ad26acb14..9db412353 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -178,7 +178,9 @@ static bool mount_is_bind(struct mntent *me) { return hasmntopt(me, "bind") || - streq(me->mnt_type, "bind"); + streq(me->mnt_type, "bind") || + hasmntopt(me, "rbind") || + streq(me->mnt_type, "rbind"); } static bool mount_is_network(struct mntent *me) { @@ -495,8 +497,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)