Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

images: Move uid_gid_extent and userns_entry descriptions

Browse source 
Move them into ns.proto file

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Kirill Tkhai 2017-02-23 18:14:42 +03:00 • committed by Andrei Vagin
parent 388d853fa3
commit a1d4cef08a
6 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
criu/include/namespaces.h
View file

@ -6,7 +6,7 @@
#include "common/compiler.h"
#include "files.h"
#include "common/list.h"
#include "images/userns.pb-c.h"
#include "images/ns.pb-c.h"
#ifndef CLONE_NEWNS
#define CLONE_NEWNS 0x00020000

1
criu/namespaces.c
View file

@ -30,7 +30,6 @@
#include "protobuf.h"
#include "util.h"
#include "images/ns.pb-c.h"
#include "images/userns.pb-c.h"
static struct ns_desc *ns_desc_array[] = {
&net_ns_desc,

1
criu/protobuf-desc.c
View file

@ -58,7 +58,6 @@
#include "images/cgroup.pb-c.h"
#include "images/timerfd.pb-c.h"
#include "images/cpuinfo.pb-c.h"
#include "images/userns.pb-c.h"
#include "images/seccomp.pb-c.h"
#include "images/binfmt-misc.pb-c.h"
#include "images/autofs.pb-c.h"

1
images/Makefile
View file

@ -53,7 +53,6 @@ proto-obj-y += siginfo.o
proto-obj-y += rpc.o
proto-obj-y += ext-file.o
proto-obj-y += cgroup.o
proto-obj-y += userns.o
proto-obj-y += google/protobuf/descriptor.o # To make protoc-c happy and compile opts.proto
proto-obj-y += opts.o
proto-obj-y += seccomp.o

11
images/ns.proto
View file

@ -6,3 +6,14 @@ message ns_file_entry {
required uint32 ns_cflag = 3;
required uint32 flags = 4;
}
message uid_gid_extent {
required uint32 first = 1;
required uint32 lower_first = 2;
required uint32 count = 3;
}
message userns_entry {
repeated uid_gid_extent uid_map = 1;
repeated uid_gid_extent gid_map = 2;
}

12
images/userns.proto
View file

@ -1,12 +0,0 @@
syntax = "proto2";
message uid_gid_extent {
required uint32 first = 1;
required uint32 lower_first = 2;
required uint32 count = 3;
}
message userns_entry {
repeated uid_gid_extent uid_map = 1;
repeated uid_gid_extent gid_map = 2;
}