Add opencontainers/runc#617 (for more LXD nesting support)

debian/patches/lxd--runc-617.patch

@@ -0,0 +1,48 @@
+From a0e87bfc2d61d5c7e668b8298b5047bfcc79824a Mon Sep 17 00:00:00 2001
+Origin: https://github.com/opencontainers/runc/pull/617
+From: Serge Hallyn <[email protected]>
+Date: Wed, 2 Mar 2016 21:00:38 -0800
+Subject: [PATCH] cgroup namespaces: ignore the mount.Root if we have cgroup
+ namespaces
+
+In a cgroup namespace, you can mount cgroupfs, and your namespace
+root (say /docker1) becomes the root of the cgroup filesystem.  This
+shows up as field 3 in the mountinfo.  This is unfortunately
+ambiguous with a cgroupfs bind mount, and in this case we cannot use
+that root as a prefix for our cgroup, since as far as we are concerned
+our cgroup is '/', not '/docker1'.
+
+So if cgroup namespaces are enabled (/proc/$$/ns/cgroup exists), then
+assume that we haven't done any silly cgroupfs bind mount trickery,
+and ignore the fs root field.
+
+Signed-off-by: Serge Hallyn <[email protected]>
+---
+ libcontainer/cgroups/utils.go | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/cgroups/utils.go b/vendor/src/github.com/opencontainers/runc/libcontainer/cgroups/utils.go
+index 006800d..8fc67a9 100644
+--- a/vendor/src/github.com/opencontainers/runc/libcontainer/cgroups/utils.go
++++ b/vendor/src/github.com/opencontainers/runc/libcontainer/cgroups/utils.go
+@@ -124,6 +124,7 @@ func (m Mount) GetThisCgroupDir(cgroups map[string]string) (string, error) {
+ func getCgroupMountsHelper(ss map[string]bool, mi io.Reader) ([]Mount, error) {
+ 	res := make([]Mount, 0, len(ss))
+ 	scanner := bufio.NewScanner(mi)
++	cgroupNamespacesEnabled := PathExists("/proc/self/ns/cgroup")
+ 	for scanner.Scan() {
+ 		txt := scanner.Text()
+ 		sepIdx := strings.Index(txt, " - ")
+@@ -136,7 +137,11 @@ func getCgroupMountsHelper(ss map[string]bool, mi io.Reader) ([]Mount, error) {
+ 		fields := strings.Split(txt, " ")
+ 		m := Mount{
+ 			Mountpoint: fields[4],
+-			Root:       fields[3],
++		}
++		if cgroupNamespacesEnabled {
++			m.Root = "/"
++		} else {
++			m.Root = fields[3]
+ 		}
+ 		for _, opt := range strings.Split(fields[len(fields)-1], ",") {
+ 			if strings.HasPrefix(opt, cgroupNamePrefix) {

debian/patches/series

@@ -14,6 +14,7 @@ overlay.patch
 devicemapper-cleanup.patch
 lxd--20631--libcontainer-bump.patch
 lxd--docker-in-userns.patch
+lxd--runc-617.patch
 libnetwork-s390x.patch
 # Upstreamed as of 1.10.2:
 #  15404.patch