summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authori.Dark_Templar <darktemplar@dark-templar-archives.net>2017-11-05 11:50:03 +0300
committerMatthias Maier <tamiko@gentoo.org>2018-01-30 11:00:12 -0600
commitdd450253467dd8d704a398d794d1a704cac81ecc (patch)
treec0c78111422314d9dcd6e273f2e0513ebfda2bdf /app-emulation/lxc/files/lxc-2.1.1-fix-cgroup2-detection.patch
parentdev-libs/libevdev: Bump to version 1.5.8 (diff)
downloadgentoo-dd450253467dd8d704a398d794d1a704cac81ecc.tar.gz
gentoo-dd450253467dd8d704a398d794d1a704cac81ecc.tar.bz2
gentoo-dd450253467dd8d704a398d794d1a704cac81ecc.zip
app-emulation/lxc: bump to version 2.1.1.
[tamiko: regenerate metadata to make remote hook happy] Closes: https://bugs.gentoo.org/636572 Closes: https://github.com/gentoo/gentoo/pull/6128 Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'app-emulation/lxc/files/lxc-2.1.1-fix-cgroup2-detection.patch')
-rw-r--r--app-emulation/lxc/files/lxc-2.1.1-fix-cgroup2-detection.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/app-emulation/lxc/files/lxc-2.1.1-fix-cgroup2-detection.patch b/app-emulation/lxc/files/lxc-2.1.1-fix-cgroup2-detection.patch
new file mode 100644
index 000000000000..c16d28ac3033
--- /dev/null
+++ b/app-emulation/lxc/files/lxc-2.1.1-fix-cgroup2-detection.patch
@@ -0,0 +1,26 @@
+From cdfe90a49f516b0f1210d181980f14a4765e10da Mon Sep 17 00:00:00 2001
+From: Christian Brauner <christian.brauner@ubuntu.com>
+Date: Mon, 30 Oct 2017 14:17:20 +0100
+Subject: [PATCH] cgfsng: fix cgroup2 detection
+
+Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
+---
+ src/lxc/cgroups/cgfsng.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
+index 897336f0..e43edd7d 100644
+--- a/src/lxc/cgroups/cgfsng.c
++++ b/src/lxc/cgroups/cgfsng.c
+@@ -815,7 +815,7 @@ static void add_controller(char **clist, char *mountpoint, char *base_cgroup)
+ new->fullcgpath = NULL;
+
+ /* record if this is the cgroup v2 hierarchy */
+- if (!strcmp(base_cgroup, "cgroup2"))
++ if (clist && !strcmp(*clist, "cgroup2"))
+ new->is_cgroup_v2 = true;
+ else
+ new->is_cgroup_v2 = false;
+--
+2.13.6
+