From c294547322b8875c903f083aa532e93263f6f026 Mon Sep 17 00:00:00 2001 From: lifeng68 Date: Wed, 27 May 2020 17:21:19 +0800 Subject: [PATCH] lxc: set default cgroup pattern to lxc/%n Signed-off-by: lifeng68 --- ...nfig-default-cgroup-pattern-to-lxc-n.patch | 26 +++++++++++++++++++ lxc.spec | 3 ++- series.conf | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 0068-lxc-config-default-cgroup-pattern-to-lxc-n.patch diff --git a/0068-lxc-config-default-cgroup-pattern-to-lxc-n.patch b/0068-lxc-config-default-cgroup-pattern-to-lxc-n.patch new file mode 100644 index 0000000..58f931e --- /dev/null +++ b/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 +Date: Wed, 27 May 2020 17:13:25 +0800 +Subject: [PATCH] lxc: config default cgroup pattern to lxc%n + +Signed-off-by: lifeng68 +--- + 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 + diff --git a/lxc.spec b/lxc.spec index 813d208..62c0407 100644 --- a/lxc.spec +++ b/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) diff --git a/series.conf b/series.conf index f94c76d..f5d846b 100644 --- a/series.conf +++ b/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 -- Gitee