!40 lxc: set default cgroup pattern to lxc/%n

Merge pull request !40 from lifeng_isula/master

0068-lxc-config-default-cgroup-pattern-to-lxc-n.patch

@@ -0,0 +1,26 @@
+From 05ab7596df7f6c4b10401d4a9006f391176d3898 Mon Sep 17 00:00:00 2001
+From: lifeng68 <lifeng68@huawei.com>
+Date: Wed, 27 May 2020 17:13:25 +0800
+Subject: [PATCH] lxc: config default cgroup pattern to lxc%n
+
+Signed-off-by: lifeng68 <lifeng68@huawei.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 438d2923..3e86431d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -496,7 +496,7 @@ AC_ARG_WITH([rootfs-path],
+ # cgroup pattern specification
+ AC_ARG_WITH([cgroup-pattern],
+ 	[AS_HELP_STRING([--with-cgroup-pattern=pattern], [pattern for container cgroups])],
+-	[with_cgroup_pattern=$withval], [with_cgroup_pattern=['']])
++	[with_cgroup_pattern=$withval], [with_cgroup_pattern=['lxc/%n']])
+ 
+ # The path for the apparmor_parser's cache for generated apparmor profiles
+ AC_ARG_WITH([apparmor-cache-dir],
+-- 
+2.20.1
+

lxc.spec

@@ -1,4 +1,4 @@
-%global _release 2020051901
+%global _release 2020052701
 %global debug_package %{nil}
 
 Name:           lxc
@@ -75,6 +75,7 @@ Patch9063:      0064-termainal-fix-console-log-memory-leak.patch
 Patch9064:      0065-lxc-disable-terminal-stdout-stderr-pipe-O_NONBLOCK.patch
 Patch9065:      0066-lxc-fix-tests-build-error.patch
 Patch9066:      0067-set-normal-ret-value-when-populate-exist-device-successfully.patch
+Patch9067:      0068-lxc-config-default-cgroup-pattern-to-lxc-n.patch
 
 BuildRequires:  systemd-units git libtool graphviz docbook2X doxygen chrpath
 BuildRequires:  pkgconfig(libseccomp)

series.conf

@@ -65,3 +65,4 @@
 0065-lxc-disable-terminal-stdout-stderr-pipe-O_NONBLOCK.patch
 0066-lxc-fix-tests-build-error.patch
 0067-set-normal-ret-value-when-populate-exist-device-successfully.patch
+0068-lxc-config-default-cgroup-pattern-to-lxc-n.patch