From aad84026fd53c69f117f75c9b9bbcd7340002cc3 Mon Sep 17 00:00:00 2001 From: yangjiaqi Date: Thu, 21 Sep 2023 11:16:54 +0800 Subject: [PATCH] fix log of RemoveUdevRule Signed-off-by: yangjiaqi --- 0011-fix-log-of-removeUdevRule.patch | 25 +++++++++++++++++++++++++ syscontainer-tools.spec | 9 ++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0011-fix-log-of-removeUdevRule.patch diff --git a/0011-fix-log-of-removeUdevRule.patch b/0011-fix-log-of-removeUdevRule.patch new file mode 100644 index 0000000..17dc6be --- /dev/null +++ b/0011-fix-log-of-removeUdevRule.patch @@ -0,0 +1,25 @@ +From 56a42267650b11f5eb691cb852f0f7a827ed715a Mon Sep 17 00:00:00 2001 +From: yangjiaqi +Date: Thu, 21 Sep 2023 11:07:21 +0800 +Subject: [PATCH] fix log of RemoveUdevRule + +--- + hooks/syscontainer-hooks/poststop.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hooks/syscontainer-hooks/poststop.go b/hooks/syscontainer-hooks/poststop.go +index 8f03bd7..f422c4e 100644 +--- a/hooks/syscontainer-hooks/poststop.go ++++ b/hooks/syscontainer-hooks/poststop.go +@@ -50,7 +50,7 @@ func RemoveUdevRule(state *configs.HookState, hookConfig *hconfig.ContainerHookC + resolvDev := calcPathForDevice(state.Root, dev) + device, err := libdevice.ParseDevice(resolvDev) + if err != nil { +- logrus.Errorf("[device-hook] Add device (%s), parse device failed: %v", resolvDev, err) ++ logrus.Errorf("[device-hook] RemoveUdevRule (%s), parse device failed: %v", resolvDev, err) + continue + } + +-- +2.30.0 + diff --git a/syscontainer-tools.spec b/syscontainer-tools.spec index 1b4c993..498b6c2 100644 --- a/syscontainer-tools.spec +++ b/syscontainer-tools.spec @@ -1,7 +1,7 @@ #Basic Information Name: syscontainer-tools Version: 0.9 -Release: 60 +Release: 61 Summary: syscontainer tools for IT, work with iSulad License: Mulan PSL v2 URL: https://gitee.com/openeuler/syscontainer-tools @@ -20,6 +20,7 @@ Patch7: 0007-support-ipv6.patch Patch8: 0008-use-file-locks-to-avoid-remounting-the-sharepath-mas.patch Patch9: 0009-clean-up-run-syscontainer-tools-netns-containerid-di.patch Patch10: 0010-drop-useless-function-error-and-info.patch +Patch11: 0011-fix-log-of-removeUdevRule.patch #Dependency BuildRequires: glibc-static @@ -121,6 +122,12 @@ chmod 0640 ${HOOK_SPEC}/hookspec.json rm -rfv %{buildroot} %changelog +* Thu Sep 21 2023 yangjiaqi - 0.9-61 +- Type:bugfix +- CVE:NA +- SUG:restart +- DESC:fix log of removeUdevRule + * Thu Aug 31 2023 yangjiaqi - 0.9-60 - Type:bugfix - CVE:NA