Look for the config file before the FS gets unshared.

[util-vserver-pl.git] / src / planetlab.c

diff --git a/src/planetlab.c b/src/planetlab.c
index 689ced4..b236b9d 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>
+#define _GNU_SOURCE 
+#include <sched.h>
 
 #include "vserver.h"
 #include "planetlab.h"
@@ -59,7 +61,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 static int
-create_context(xid_t ctx, uint64_t bcaps)
+create_context(xid_t ctx, uint64_t bcaps, uint32_t unshare_flags)
 {
   struct vc_ctx_caps   vc_caps;
   struct vc_net_flags  vc_nf;
@@ -96,11 +98,9 @@ process:
   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 | vc_get_space_mask());
+    if (unshare_mask != 0) {
+      unshare(unshare_mask);
+      vc_set_namespace(ctx, unshare_mask);
   }
 
   /* Set capabilities - these don't take effect until SETUP flag is unset */
@@ -152,11 +152,15 @@ pl_chcontext(xid_t ctx, uint64_t bcaps, const struct sliver_resources *slr)
 
       if (vc_get_cflags(ctx, &vc_flags))
        {
+        uint32_t unshare_mask;
          if (errno != ESRCH)
            return -1;
 
+       /* Unshare the net namespace if the slice if requested in the local slice configuration */
+        unshare_mask = get_space_flag(ctx);
+
          /* context doesn't exist - create it */
-         if (create_context(ctx, bcaps))
+         if (create_context(ctx, bcaps, unshare_mask))
            {
              if (errno == EEXIST)
                /* another process beat us in a race */
@@ -188,6 +192,14 @@ pl_chcontext(xid_t ctx, uint64_t bcaps, const struct sliver_resources *slr)
     migrate:
       if (net_migrated || !vc_net_migrate(ctx))
        {
+        uint32_t unshare_mask;
+      /* 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);
+          unshare(unshare_mask);
+      }
+
          if (!vc_tag_migrate(ctx) && !vc_ctx_migrate(ctx, 0))
            break;  /* done */
          net_migrated = 1;