From 594c68904a04a56598959c0cce1a7c04eec73d18 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Sat, 12 Jan 2008 15:55:25 +0000 Subject: [PATCH] Add support for PID and net namespaces. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2659 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- lib/vserver.h | 6 ++++++ src/vspace.c | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/vserver.h b/lib/vserver.h index be896e1..0aa5d36 100644 --- a/lib/vserver.h +++ b/lib/vserver.h @@ -311,6 +311,12 @@ #ifndef CLONE_NEWUSER # define CLONE_NEWUSER 0x10000000 #endif +#ifndef CLONE_NEWPID +# define CLONE_NEWPID 0x20000000 +#endif +#ifndef CLONE_NEWNET +# define CLONE_NEWNET 0x40000000 +#endif #define VC_BAD_PERSONALITY ((uint_least32_t)(-1)) diff --git a/src/vspace.c b/src/vspace.c index ce57879..08f1b28 100644 --- a/src/vspace.c +++ b/src/vspace.c @@ -56,6 +56,8 @@ CMDLINE_OPTIONS[] = { { "ipc", no_argument, 0, 'I' }, { "uts", no_argument, 0, 'U' }, { "user", no_argument, 0, 'S' }, + { "pid", no_argument, 0, 'P' }, + { "net", no_argument, 0, 'N' }, {0,0,0,0} }; @@ -83,6 +85,8 @@ showHelp(int fd, char const *cmd, int res) " --ipc ... the IPC namespace\n" " --uts ... the uts namespace\n" " --user ... the user namespace\n" + " --pid ... the pid namespace\n" + " --net ... the network namespace\n" "\n" "Please report bugs to " PACKAGE_BUGREPORT "\n"); @@ -153,7 +157,7 @@ int main(int argc, char *argv[]) int sum = 0; while (1) { - int c = getopt_long(argc, argv, "+nsce:m:" "MFIUS", CMDLINE_OPTIONS, 0); + int c = getopt_long(argc, argv, "+nsce:m:" "MFIUSPN", CMDLINE_OPTIONS, 0); if (c==-1) break; switch (c) { @@ -178,6 +182,8 @@ int main(int argc, char *argv[]) case 'I' : mask |= CLONE_NEWIPC; break; case 'U' : mask |= CLONE_NEWUTS; break; case 'S' : mask |= CLONE_NEWUSER; break; + case 'P' : mask |= CLONE_NEWPID; break; + case 'N' : mask |= CLONE_NEWNET; break; default : WRITE_MSG(2, "Try '"); -- 1.8.1.5