!419 fix lxc write error message

Merge pull request !419 from ger202/master

0023-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
+

lxc.spec

@@ -1,4 +1,4 @@
-%global _release 2022102409
+%global _release 2022102410
 
 Name:           lxc
 Version:        4.0.3
@@ -30,7 +30,8 @@ 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-remove-process-inheritable-capability.patch
+Patch0023:	0023-fix-lxc-write-error-message.patch
+Patch0024:	0024-remove-process-inheritable-capability.patch
 
 BuildRequires:  systemd-units git libtool graphviz docbook2X doxygen chrpath
 BuildRequires:  pkgconfig(libseccomp)
@@ -211,18 +212,24 @@ rm -rf %{buildroot}%{_sysconfdir}/default/%{name}
 %endif
 
 %changelog
-* Fri Feb 17 2023 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022102409
+* Fri Feb 17 2023 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022102410
 - Type:bugfix
 - ID:NA
 - SUG:NA
 - DESC: remove process inheritable capabilities
 
-* Mon Feb 13 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 4.0.3-2022102408
+* Mon Feb 13 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 4.0.3-2022102409
 - Type:enhancement
 - ID:NA
 - SUG:NA
 - DESC:optimize test command
 
+* Wed Feb 08 2023 huangsong<huangsong14@huawei.com> - 4.0.3-2022102408
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: fix lxc write error message
+
 * Fri Jan 13 2023 wangrunze<wangrunze13@huawei.com> - 4.0.3-2022102407
 - Type:bugfix
 - ID:NA