#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;
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) {
+ if (unshare_mask != 0) {
unshare(unshare_mask);
vc_set_namespace(ctx, unshare_mask);
}
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 */
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))