From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon, 6 Nov 2017 22:24:01 +0000 (+0100)
Subject: start: only preserve CLONE_NEWCGROUP when supported
X-Git-Tag: lxc-3.0.0.beta1~199^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1906%2Fhead;p=thirdparty%2Flxc.git

start: only preserve CLONE_NEWCGROUP when supported

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/start.c b/src/lxc/start.c
index fe76b2357..ca80136d5 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1402,13 +1402,15 @@ static int lxc_spawn(struct lxc_handler *handler)
 	if (lxc_sync_barrier_child(handler, LXC_SYNC_READY_START))
 		return -1;
 
-	ret = lxc_preserve_ns(handler->pid, "cgroup");
-	if (ret < 0) {
-		ERROR("%s - Failed to preserve cgroup namespace", strerror(errno));
-		goto out_delete_net;
+	if (cgns_supported()) {
+		ret = lxc_preserve_ns(handler->pid, "cgroup");
+		if (ret < 0) {
+			ERROR("%s - Failed to preserve cgroup namespace", strerror(errno));
+			goto out_delete_net;
+		}
+		handler->nsfd[LXC_NS_CGROUP] = ret;
+		DEBUG("Preserved cgroup namespace via fd %d", ret);
 	}
-	handler->nsfd[LXC_NS_CGROUP] = ret;
-	DEBUG("Preserved cgroup namespace via fd %d", ret);
 
 	if (lxc_network_recv_name_and_ifindex_from_child(handler) < 0) {
 		ERROR("Failed to receive names and ifindices for network "