From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon, 10 Sep 2018 13:24:21 +0000 (+0200)
Subject: cgroups: switch to lxc.payload as default pattern
X-Git-Tag: lxc-3.1.0~98^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=292b3910d565e02910a89becbde6d0d9c8ce26bb;p=thirdparty%2Flxc.git

cgroups: switch to lxc.payload as default pattern

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

diff --git a/configure.ac b/configure.ac
index 542885767..24c53ca0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -483,7 +483,7 @@ AC_ARG_WITH([cgroup-pattern],
 	[AC_HELP_STRING(
 		[--with-cgroup-pattern=pattern],
 		[pattern for container cgroups]
-	)], [], [with_cgroup_pattern=['lxc/%n']])
+	)], [], [with_cgroup_pattern=['lxc.payload/%n']])
 
 # The path for the apparmor_parser's cache for generated apparmor profiles
 AC_ARG_WITH([apparmor-cache-dir],
diff --git a/src/lxc/initutils.c b/src/lxc/initutils.c
index 467d3f0bc..4257ffeaa 100644
--- a/src/lxc/initutils.c
+++ b/src/lxc/initutils.c
@@ -101,7 +101,7 @@ const char *lxc_global_config_value(const char *option_name)
 		sprintf(user_config_path, "%s/.config/lxc/lxc.conf", user_home);
 		sprintf(user_default_config_path, "%s/.config/lxc/default.conf", user_home);
 		sprintf(user_lxc_path, "%s/.local/share/lxc/", user_home);
-		user_cgroup_pattern = strdup("lxc/%n");
+		user_cgroup_pattern = strdup("lxc.payload/%n");
 	}
 	else {
 		user_config_path = strdup(LXC_GLOBAL_CONF);