git://git.onelab.eu
/
util-vserver-pl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
headers for sys_unshare
[util-vserver-pl.git]
/
src
/
planetlab.c
diff --git
a/src/planetlab.c
b/src/planetlab.c
index
15cc7e5
..
2abd733
100644
(file)
--- a/
src/planetlab.c
+++ b/
src/planetlab.c
@@
-44,6
+44,8
@@
POSSIBILITY OF SUCH DAMAGE.
#include <ctype.h>
#include <sys/resource.h>
#include <fcntl.h>
#include <ctype.h>
#include <sys/resource.h>
#include <fcntl.h>
+#define _GNU_SOURCE
+#include <sched.h>
#include "vserver.h"
#include "planetlab.h"
#include "vserver.h"
#include "planetlab.h"
@@
-64,6
+66,7
@@
create_context(xid_t ctx, uint64_t bcaps)
struct vc_ctx_caps vc_caps;
struct vc_net_flags vc_nf;
struct vc_net_caps vc_ncaps;
struct vc_ctx_caps vc_caps;
struct vc_net_flags vc_nf;
struct vc_net_caps vc_ncaps;
+ uint32_t unshare_mask;
/* Create network context */
if (vc_net_create(ctx) == VC_NOCTX) {
/* Create network context */
if (vc_net_create(ctx) == VC_NOCTX) {
@@
-88,12
+91,20
@@
tag:
return -1;
process:
return -1;
process:
+
/*
* Create context info - this sets the STATE_SETUP and STATE_INIT flags.
*/
if (vc_ctx_create(ctx, 0) == VC_NOCTX)
return -1;
/*
* Create context info - this sets the STATE_SETUP and STATE_INIT flags.
*/
if (vc_ctx_create(ctx, 0) == VC_NOCTX)
return -1;
+ /* Unshare the net namespace if the slice if requested in the local slice configuration */
+ unshare_mask = get_space_flag(ctx);
+ if (unshare_mask != 0) {
+ sys_unshare(unshare_mask);
+ vc_set_namespace(ctx, unshare_mask);
+ }
+
/* Set capabilities - these don't take effect until SETUP flag is unset */
vc_caps.bcaps = bcaps;
vc_caps.bmask = ~0ULL; /* currently unused */
/* Set capabilities - these don't take effect until SETUP flag is unset */
vc_caps.bcaps = bcaps;
vc_caps.bmask = ~0ULL; /* currently unused */
@@
-179,6
+190,12
@@
pl_chcontext(xid_t ctx, uint64_t bcaps, const struct sliver_resources *slr)
migrate:
if (net_migrated || !vc_net_migrate(ctx))
{
migrate:
if (net_migrated || !vc_net_migrate(ctx))
{
+ /* Unshare the net namespace if the slice if requested in the local slice configuration */
+ unshare_mask = get_space_flag(ctx);
+ if (unshare_mask != 0) {
+ vc_enter_namespace(ctx, unshare_mask);
+ }
+
if (!vc_tag_migrate(ctx) && !vc_ctx_migrate(ctx, 0))
break; /* done */
net_migrated = 1;
if (!vc_tag_migrate(ctx) && !vc_ctx_migrate(ctx, 0))
break; /* done */
net_migrated = 1;
@@
-251,6
+268,7
@@
struct pl_resources {
if (index < len) index++; else goto out;
#define VSERVERCONF "/etc/vservers/"
if (index < len) index++; else goto out;
#define VSERVERCONF "/etc/vservers/"
+
void
pl_get_limits(const char *context, struct sliver_resources *slr)
{
void
pl_get_limits(const char *context, struct sliver_resources *slr)
{