#include <ctype.h>
#include <sys/resource.h>
#include <fcntl.h>
+#define _GNU_SOURCE
+#include <sched.h>
#include "vserver.h"
#include "planetlab.h"
#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;
struct vc_net_caps vc_ncaps;
- uint32_t unshare_mask;
/* Create network context */
if (vc_net_create(ctx) == VC_NOCTX) {
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);
+ if (unshare_flags != 0) {
+ unshare(unshare_flags);
+ unshare_flags |= vc_space_mask();
+ vc_set_namespace(ctx, unshare_flags);
}
/* Set capabilities - these don't take effect until SETUP flag is unset */
if (vc_get_cflags(ctx, &vc_flags))
{
+ uint32_t unshare_flags;
if (errno != ESRCH)
return -1;
+ /* Unshare the net namespace if the slice if requested in the local slice configuration */
+ unshare_flags = get_space_flag(ctx);
+
/* context doesn't exist - create it */
- if (create_context(ctx, bcaps))
+ if (create_context(ctx, bcaps, unshare_flags))
{
if (errno == EEXIST)
/* another process beat us in a race */
migrate:
if (net_migrated || !vc_net_migrate(ctx))
{
+ uint32_t unshare_flags;
+ /* Unshare the net namespace if the slice if requested in the local slice configuration */
+ unshare_flags = get_space_flag(ctx);
+ if (unshare_flags != 0) {
+ unshare|=vc_space_flags();
+ vc_enter_namespace(ctx, unshare_flags);
+ }
+
if (!vc_tag_migrate(ctx) && !vc_ctx_migrate(ctx, 0))
break; /* done */
net_migrated = 1;