Commit 8b019e0b authored by Pavel Emelyanov's avatar Pavel Emelyanov

mnt: Don't delay external mount points

It looks like criu constantly postpones external bind mounts. I'm trying to resolve
when we manage to break this (when I did ext-mount-map they for some reason didn't).
Meanwhile, this patch fixes it back.
Reported-by: 's avatarSaied Kazemi <saied@google.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 59dae237
......@@ -1380,9 +1380,9 @@ static bool can_mount_now(struct mount_info *mi)
/*
* Other mounts can be mounted only if they have
* the master mount (see propagate_mount) or if we
* expect a plugin to help us.
* expect a plugin/ext-mount-map to help us.
*/
if (mi->bind || mi->need_plugin)
if (mi->bind || mi->need_plugin || mi->external)
return true;
return false;
......@@ -1415,7 +1415,7 @@ static int do_mount_one(struct mount_info *mi)
if (!mi->parent)
ret = do_mount_root(mi);
else if (!mi->bind && !mi->need_plugin)
else if (!mi->bind && !mi->need_plugin && !mi->external)
ret = do_new_mount(mi);
else
ret = do_bind_mount(mi);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment