Skip to content

Commit

Permalink
mount: set is_ns_root on dump
Browse files Browse the repository at this point in the history
It is required to not dump content of the root mount in dump_one_fd().

travis-ci: success for Fix a few issues to dump/restore Docker containers with userns
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
  • Loading branch information
avagin authored and xemul committed Nov 3, 2016
1 parent c64ebbc commit 606d88f
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions criu/proc_parse.c
Expand Up @@ -37,6 +37,7 @@
#include "cgroup.h"
#include "cgroup-props.h"
#include "timerfd.h"
#include "path.h"

#include "protobuf.h"
#include "images/fdinfo.pb-c.h"
Expand Down Expand Up @@ -1318,6 +1319,7 @@ static int parse_mountinfo_ent(char *str, struct mount_info *new, char **fsname)
if (!new->mountpoint)
goto err;
new->ns_mountpoint = new->mountpoint;
new->is_ns_root = is_root(new->ns_mountpoint + 1);

new->s_dev = new->s_dev_rt = MKKDEV(kmaj, kmin);
new->flags = 0;
Expand Down

0 comments on commit 606d88f

Please sign in to comment.