diff options
| author | Serge Hallyn | 2016-03-03 02:53:42 +0100 |
|---|---|---|
| committer | Serge Hallyn | 2016-03-03 02:53:42 +0100 |
| commit | f9e7b66dbded19d798b883be68b0613749d7b8bb (patch) | |
| tree | f4991edc70c9bf49c63895d16b35aa9211675128 /sys-utils/nsenter.c | |
| parent | blkdiscard: add --zeroout (BLKZEROOUT ioctl) (diff) | |
| download | kernel-qcow2-util-linux-f9e7b66dbded19d798b883be68b0613749d7b8bb.tar.gz kernel-qcow2-util-linux-f9e7b66dbded19d798b883be68b0613749d7b8bb.tar.xz kernel-qcow2-util-linux-f9e7b66dbded19d798b883be68b0613749d7b8bb.zip | |
Implement support for cgroup namespaces
Currently these are supported in #for-next.
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Diffstat (limited to 'sys-utils/nsenter.c')
| -rw-r--r-- | sys-utils/nsenter.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c index 371572580..d8690db36 100644 --- a/sys-utils/nsenter.c +++ b/sys-utils/nsenter.c @@ -52,12 +52,13 @@ static struct namespace_file { * first. This gives an unprivileged user the potential to * enter the other namespaces. */ - { .nstype = CLONE_NEWUSER, .name = "ns/user", .fd = -1 }, - { .nstype = CLONE_NEWIPC, .name = "ns/ipc", .fd = -1 }, - { .nstype = CLONE_NEWUTS, .name = "ns/uts", .fd = -1 }, - { .nstype = CLONE_NEWNET, .name = "ns/net", .fd = -1 }, - { .nstype = CLONE_NEWPID, .name = "ns/pid", .fd = -1 }, - { .nstype = CLONE_NEWNS, .name = "ns/mnt", .fd = -1 }, + { .nstype = CLONE_NEWUSER, .name = "ns/user", .fd = -1 }, + { .nstype = CLONE_NEWCGROUP,.name = "ns/cgroup", .fd = -1 }, + { .nstype = CLONE_NEWIPC, .name = "ns/ipc", .fd = -1 }, + { .nstype = CLONE_NEWUTS, .name = "ns/uts", .fd = -1 }, + { .nstype = CLONE_NEWNET, .name = "ns/net", .fd = -1 }, + { .nstype = CLONE_NEWPID, .name = "ns/pid", .fd = -1 }, + { .nstype = CLONE_NEWNS, .name = "ns/mnt", .fd = -1 }, { .nstype = 0, .name = NULL, .fd = -1 } }; @@ -79,6 +80,7 @@ static void usage(int status) fputs(_(" -i, --ipc[=<file>] enter System V IPC namespace\n"), out); fputs(_(" -n, --net[=<file>] enter network namespace\n"), out); fputs(_(" -p, --pid[=<file>] enter pid namespace\n"), out); + fputs(_(" -C, --cgroup[=<file>] enter cgroup namespace\n"), out); fputs(_(" -U, --user[=<file>] enter user namespace\n"), out); fputs(_(" -S, --setuid <uid> set uid in entered namespace\n"), out); fputs(_(" -G, --setgid <gid> set gid in entered namespace\n"), out); @@ -186,6 +188,7 @@ int main(int argc, char *argv[]) { "net", optional_argument, NULL, 'n' }, { "pid", optional_argument, NULL, 'p' }, { "user", optional_argument, NULL, 'U' }, + { "cgroup", optional_argument, NULL, 'C' }, { "setuid", required_argument, NULL, 'S' }, { "setgid", required_argument, NULL, 'G' }, { "root", optional_argument, NULL, 'r' }, @@ -214,7 +217,7 @@ int main(int argc, char *argv[]) atexit(close_stdout); while ((c = - getopt_long(argc, argv, "+hVt:m::u::i::n::p::U::S:G:r::w::FZ", + getopt_long(argc, argv, "+hVt:m::u::i::n::p::C::U::S:G:r::w::FZ", longopts, NULL)) != -1) { switch (c) { case 'h': @@ -256,6 +259,12 @@ int main(int argc, char *argv[]) else namespaces |= CLONE_NEWPID; break; + case 'C': + if (optarg) + open_namespace_fd(CLONE_NEWCGROUP, optarg); + else + namespaces |= CLONE_NEWCGROUP; + break; case 'U': if (optarg) open_namespace_fd(CLONE_NEWUSER, optarg); |