Merge pull request #88 from giuseppe/fix-private-cgroup-ns

libcrun: fix creating a new cgroup ns
containers · Sep 13, 2019 · 6a2c111 · 6a2c111
2 parents 6adde2d + e4a2370
commit 6a2c111
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/libcrun/container.c b/src/libcrun/container.c
@@ -483,10 +483,6 @@ container_entrypoint_init (void *args, const char *notify_socket,
   if (UNLIKELY (ret < 0))
     return ret;
 
-  ret = libcrun_container_enter_cgroup_ns (container, err);
-  if (UNLIKELY (ret < 0))
-    return ret;
-
   ret = sync_socket_send_sync (sync_socket, false, err);
   if (UNLIKELY (ret < 0))
     return ret;

diff --git a/src/libcrun/linux.c b/src/libcrun/linux.c
@@ -1183,6 +1183,10 @@ libcrun_set_mounts (libcrun_container_t *container, const char *rootfs, libcrun_
       get_private_data (container)->remounts = r;
     }
 
+  ret = libcrun_container_enter_cgroup_ns (container, err);
+  if (UNLIKELY (ret < 0))
+    return ret;
+
   ret = do_mounts (container, rootfs, err);
   if (UNLIKELY (ret < 0))
     return ret;