Commit d29b00d8 authored by Andrei Vagin's avatar Andrei Vagin Committed by Pavel Emelyanov

mount: don't dump content for external mounts

External mounts are provided by an user and CRIU doesn't
need to restore their content.

https://github.com/xemul/criu/issues/299

Reported-by: Stéphane Graber
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent ceaa6603
...@@ -1263,13 +1263,14 @@ static int dump_one_mountpoint(struct mount_info *pm, struct cr_img *img) ...@@ -1263,13 +1263,14 @@ static int dump_one_mountpoint(struct mount_info *pm, struct cr_img *img)
if (me.fstype == FSTYPE__AUTO) if (me.fstype == FSTYPE__AUTO)
me.fsname = pm->fsname; me.fsname = pm->fsname;
if (!pm->external) {
if (!pm->dumped && dump_one_fs(pm))
return -1;
if (!pm->dumped && dump_one_fs(pm)) if (!fsroot_mounted(pm) &&
return -1; pm->fstype->check_bindmount && pm->fstype->check_bindmount(pm))
return -1;
if (!fsroot_mounted(pm) && }
pm->fstype->check_bindmount && pm->fstype->check_bindmount(pm))
return -1;
if (pm->mnt_id == CRTIME_MNT_ID) { if (pm->mnt_id == CRTIME_MNT_ID) {
pr_info("Skip dumping cr-time mountpoint: %s\n", pm->mountpoint); pr_info("Skip dumping cr-time mountpoint: %s\n", pm->mountpoint);
......
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