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 5428857671031f1ed64ff1c4a3365e478986c8a3..24c53ca0ce304e231ee603da42fdb0d6f6f7388c 100644 (file)
--- 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 467d3f0bceb163758d04eb857eaeb8b6056e9875..4257ffeaa979b48e81a27429f3df332354c8ffa6 100644 (file)
--- 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);