From 428c5a1726c31d3e3e02566280950fb4aaf290b8 Mon Sep 17 00:00:00 2001 From: songbuhuang <544824346@qq.com> Date: Wed, 8 Feb 2023 14:54:34 +0800 Subject: [PATCH] fix lxc write error message Signed-off-by: songbuhuang <544824346@qq.com> (cherry picked from commit 4c32cee5def14a1d364b57903b3547a3c5ec0d8c) --- 0057-fix-lxc-write-error-message.patch | 26 ++++++++++++++++++++++++++ lxc.spec | 9 ++++++++- series.conf | 3 ++- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 0057-fix-lxc-write-error-message.patch diff --git a/0057-fix-lxc-write-error-message.patch b/0057-fix-lxc-write-error-message.patch new file mode 100644 index 0000000..91d30a7 --- /dev/null +++ b/0057-fix-lxc-write-error-message.patch @@ -0,0 +1,26 @@ +From 45948760921dbaa1c030b6848168b89428ca1434 Mon Sep 17 00:00:00 2001 +From: songbuhuang <544824346@qq.com> +Date: Wed, 8 Feb 2023 14:46:44 +0800 +Subject: [PATCH] fix lxc write error message + +Signed-off-by: songbuhuang <544824346@qq.com> +--- + src/lxc/cgroups/isulad_cgfsng.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lxc/cgroups/isulad_cgfsng.c b/src/lxc/cgroups/isulad_cgfsng.c +index f5cf81c..6ccff63 100644 +--- a/src/lxc/cgroups/isulad_cgfsng.c ++++ b/src/lxc/cgroups/isulad_cgfsng.c +@@ -2463,7 +2463,7 @@ retry: + goto retry; + } + lxc_write_error_message(ops->errfd, +- "%s:%d: setting cgroup config for ready process caused \"failed to write %s to %s: %s\".", ++ "%s:%d: setting cgroup config for ready process caused failed to write %s to %s: %s", + __FILE__, __LINE__, value, fullpath, strerror(errno)); + } + free(fullpath); +-- +2.25.1 + diff --git a/lxc.spec b/lxc.spec index e49fca4..50b0df4 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 2022102408 +%global _release 2022102409 Name: lxc Version: 4.0.3 @@ -64,6 +64,7 @@ Patch0053: 0053-change-the-suffi-parameter-in-lxc-attach-help-output.patch Patch0054: 0054-rollback-strprint-code-modified.patch Patch0055: 0055-add-sscanf-adapation-code-for-musl.patch Patch0056: 0056-fix-cve-CVE-2022-47952-log-leaks-root-information.patch +Patch0057: 0057-fix-lxc-write-error-message.patch BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: pkgconfig(libseccomp) @@ -244,6 +245,12 @@ make check %endif %changelog +* Wed Feb 08 2023 huangsong - 4.0.3-2022102409 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: fix lxc write error message + * Fri Jan 13 2023 wangrunze - 4.0.3-2022102408 - Type:bugfix - ID:NA diff --git a/series.conf b/series.conf index dc10329..1c47be9 100644 --- a/series.conf +++ b/series.conf @@ -53,4 +53,5 @@ 0053-change-the-suffi-parameter-in-lxc-attach-help-output.patch 0054-rollback-strprint-code-modified.patch 0055-add-sscanf-adapation-code-for-musl.patch -0056-fix-cve-CVE-2022-47952-log-leaks-root-information.patch \ No newline at end of file +0056-fix-cve-CVE-2022-47952-log-leaks-root-information.patch +0057-fix-lxc-write-error-message.patch -- Gitee