From 69831040fcbc2c2e2dfd2f27fc581bc018f952ea Mon Sep 17 00:00:00 2001 From: songbuhuang <544824346@qq.com> Date: Wed, 8 Feb 2023 19:23:48 +0800 Subject: [PATCH] fix lxc write error message Signed-off-by: songbuhuang <544824346@qq.com> --- 0023-fix-lxc-write-error-message.patch | 26 ++++++++++++++++++++++++++ lxc.spec | 9 ++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0023-fix-lxc-write-error-message.patch diff --git a/0023-fix-lxc-write-error-message.patch b/0023-fix-lxc-write-error-message.patch new file mode 100644 index 0000000..0f481f2 --- /dev/null +++ b/0023-fix-lxc-write-error-message.patch @@ -0,0 +1,26 @@ +From 46206479e1cde0ccd0c0885e5b982ed7ed6d28b9 Mon Sep 17 00:00:00 2001 +From: isuladci +Date: Wed, 8 Feb 2023 19:18:07 +0800 +Subject: [PATCH] fix lxc write error message + +Signed-off-by: isuladci +--- + 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 8a9656a..2e550ad 100644 +--- a/src/lxc/cgroups/isulad_cgfsng.c ++++ b/src/lxc/cgroups/isulad_cgfsng.c +@@ -2464,7 +2464,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 5c93d52..1d279c4 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 2022102407 +%global _release 2022102408 Name: lxc Version: 4.0.3 @@ -30,6 +30,7 @@ Patch0019: 0019-add-lxc-attach-add-gids-option.patch Patch0020: 0020-add-sscanf-adapation-code-for-musl.patch Patch0021: 0021-change-the-suffi-parameter-in-lxc-attach-help-output.patch Patch0022: 0022-fix-cve-CVE-2022-47952-log-leaks-root-information.patch +Patch0023: 0023-fix-lxc-write-error-message.patch BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: pkgconfig(libseccomp) @@ -210,6 +211,12 @@ make check %endif %changelog +* Wed Feb 08 2023 huangsong - 4.0.3-2022102408 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: fix lxc write error message + * Fri Jan 13 2023 wangrunze - 4.0.3-2022102407 - Type:bugfix - ID:NA -- Gitee