diff --git a/0016-skip-kill-cgroup-processes-if-no-hierarchies.patch b/0016-skip-kill-cgroup-processes-if-no-hierarchies.patch new file mode 100644 index 0000000000000000000000000000000000000000..9538da7781bdaa78d96f32346fd75c754ec3a8de --- /dev/null +++ b/0016-skip-kill-cgroup-processes-if-no-hierarchies.patch @@ -0,0 +1,36 @@ +From 2aa9204b74c96413944a715408cfd5d2f3a34d66 Mon Sep 17 00:00:00 2001 +From: isuladci +Date: Thu, 22 Sep 2022 10:44:26 +0800 +Subject: [PATCH] skip kill cgroup processes if no hierarchies + +Signed-off-by: isuladci +--- + src/lxc/cgroups/isulad_cgfsng.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/lxc/cgroups/isulad_cgfsng.c b/src/lxc/cgroups/isulad_cgfsng.c +index 8a9656a..f5cf81c 100644 +--- a/src/lxc/cgroups/isulad_cgfsng.c ++++ b/src/lxc/cgroups/isulad_cgfsng.c +@@ -677,15 +677,14 @@ __cgfsng_ops static bool isulad_cgfsng_payload_destroy(struct cgroup_ops *ops, + return false; + } + +-#ifdef HAVE_ISULAD + if (ops->no_controller) { +- DEBUG("no controller found, isgnore isulad_cgfsng_payload_destroy"); ++ DEBUG("no controller found, ignore isulad_cgfsng_payload_destroy"); + return true; + } +-#endif + + if (!ops->hierarchies) { +- return false; ++ DEBUG("no hierarchies found, ignore isulad_cgfsng_payload_destroy"); ++ return true; + } + + if (!handler) { +-- +2.25.1 + diff --git a/lxc.spec b/lxc.spec index e8d7143302b6056b52af2b5f7833573e7c11af62..8cb3533f3f17db8ae44a054661535b5e5aa2b43f 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 2022092001 +%global _release 2022092201 Name: lxc Version: 4.0.3 @@ -21,8 +21,9 @@ Patch0010: 0010-check-yajl-only-when-have-isulad.patch Patch0011: 0011-drop-security_context_t.patch Patch0012: 0012-only-set-user-or-image-set-non-empty-HOME.patch Patch0013: 0013-return-fail-if-no-args-or-no-rootfs-path-found.patch -Patch0014: 0014-fix-tools-using-option-give-error-message.patch -Patch0015: 0015-fix-do-mask-pathes-after-parent-mounted.patch +Patch0014: 0014-fix-tools-using-option-give-error-message.patch +Patch0015: 0015-fix-do-mask-pathes-after-parent-mounted.patch +Patch0016: 0016-skip-kill-cgroup-processes-if-no-hierarchies.patch BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: pkgconfig(libseccomp) @@ -194,6 +195,12 @@ make check %{_mandir}/*/man7/%{name}* %changelog +* The Sep 22 2022 zhangxiaoyu - 4.0.3-2022092201 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: skip kill cgroup processes if no hierarchies + * Tue Sep 20 2022 Neil.wrz - 4.0.3-2022092001 - Type:bugfix - ID:NA