From 62e80fc23a3a5220340770c582d3355bfd620238 Mon Sep 17 00:00:00 2001 From: Andy Bavier Date: Wed, 22 Apr 2009 18:12:48 +0000 Subject: [PATCH 1/1] Update to code actually running on Trellis v0.1 --- src/planetlab.c | 12 +++++++----- util-vserver-pl.spec | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/planetlab.c b/src/planetlab.c index 78174ef..3c06261 100644 --- a/src/planetlab.c +++ b/src/planetlab.c @@ -97,9 +97,10 @@ process: if (vc_ctx_create(ctx, 0) == VC_NOCTX) return -1; - if (unshare_flags != 0) { + if (unshare_flags != 0) { unshare(unshare_flags); unshare_flags |= vc_get_space_mask(); + //printf("vc_set_namespace(%d, %X)\n", ctx, unshare_flags); vc_set_namespace(ctx, unshare_flags); } @@ -143,7 +144,7 @@ pl_chcontext(xid_t ctx, uint64_t bcaps, const struct sliver_resources *slr, { int retry_count = 0; int net_migrated = 0; - + if (pl_set_ulimits(slr) != 0) return -1; @@ -157,8 +158,8 @@ pl_chcontext(xid_t ctx, uint64_t bcaps, const struct sliver_resources *slr, if (errno != ESRCH) return -1; - /* Unshare the net namespace if requested in the slice configuration */ - unshare_flags = unshare_netns ? CLONE_NEWNET : 0; + /* Always unshare the net namespace for a new context */ + unshare_flags = CLONE_NEWNET; /* context doesn't exist - create it */ if (create_context(ctx, bcaps, unshare_flags)) @@ -195,11 +196,12 @@ pl_chcontext(xid_t ctx, uint64_t bcaps, const struct sliver_resources *slr, { uint32_t unshare_flags; - /* Unshare the net namespace if requested in the slice configuration */ + /* Unshare the net namespace if requested in the slice config */ unshare_flags = unshare_netns ? CLONE_NEWNET : 0; if (unshare_flags != 0) { unshare_flags |=vc_get_space_mask(); + //printf("vc_enter_namespace(%d, %X)\n", ctx, unshare_flags); vc_enter_namespace(ctx, unshare_flags); } diff --git a/util-vserver-pl.spec b/util-vserver-pl.spec index 33a1fd4..c2d502e 100644 --- a/util-vserver-pl.spec +++ b/util-vserver-pl.spec @@ -5,7 +5,7 @@ %define name util-vserver-pl %define version 0.3 -%define taglevel 15.trellis +%define taglevel 16.trellis %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} -- 2.43.0