diff options
| author | CoprDistGit <infra@openeuler.org> | 2024-01-20 09:57:05 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2024-01-20 09:57:05 +0000 |
| commit | c56563a5cfb85fcba9f28dd1df9647037eb2931e (patch) | |
| tree | 82e936c48ac53d5a05ac395f897e421a743f8023 /0034-2277-remove-shim-v2-format-error-log.patch | |
| parent | 8c7a257a80c20ee3fae444f9e3d670a86dca161f (diff) | |
automatic import of iSuladopeneuler23.09openeuler22.03_LTS_SP2
Diffstat (limited to '0034-2277-remove-shim-v2-format-error-log.patch')
| -rw-r--r-- | 0034-2277-remove-shim-v2-format-error-log.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/0034-2277-remove-shim-v2-format-error-log.patch b/0034-2277-remove-shim-v2-format-error-log.patch new file mode 100644 index 0000000..1573b9e --- /dev/null +++ b/0034-2277-remove-shim-v2-format-error-log.patch @@ -0,0 +1,25 @@ +From fe03c12676b8a48a2aede2d177f2cbcbdd68f930 Mon Sep 17 00:00:00 2001 +From: jake <jikai11@huawei.com> +Date: Sat, 25 Nov 2023 03:34:01 +0000 +Subject: [PATCH 34/64] !2277 remove shim v2 format error log * remove shim v2 + format error log + +--- + src/daemon/modules/runtime/shim/shim_rt_ops.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/daemon/modules/runtime/shim/shim_rt_ops.c b/src/daemon/modules/runtime/shim/shim_rt_ops.c +index 1bc9dc54..5066f804 100644 +--- a/src/daemon/modules/runtime/shim/shim_rt_ops.c ++++ b/src/daemon/modules/runtime/shim/shim_rt_ops.c +@@ -115,7 +115,6 @@ bool is_valid_v2_runtime(const char* name) + + parts_len = util_array_len((const char **)parts); + if (!(parts_len == 4 && strcmp(parts[0], "io") == 0 && strcmp(parts[1], "containerd") == 0)) { +- ERROR("ShimV2 runtime format is wrong"); + util_free_array(parts); + return false; + } +-- +2.42.0 + |