From 7caa120b44b5fe7ff8912812275646293c481810 Mon Sep 17 00:00:00 2001 From: zhangxiaoyu Date: Fri, 26 Mar 2021 09:41:54 +0800 Subject: [PATCH] iSulad: sync with upstream iSulad Signed-off-by: zhangxiaoyu (cherry picked from commit 44614165dc35fd19eb7264f3cec772654ffd7d6d) --- ...n-inspect-container-when-daemon-sets.patch | 34 +++++++++++++++++++ iSulad.spec | 9 ++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 0054-fix-coredump-when-inspect-container-when-daemon-sets.patch diff --git a/0054-fix-coredump-when-inspect-container-when-daemon-sets.patch b/0054-fix-coredump-when-inspect-container-when-daemon-sets.patch new file mode 100644 index 0000000..caa023e --- /dev/null +++ b/0054-fix-coredump-when-inspect-container-when-daemon-sets.patch @@ -0,0 +1,34 @@ +From c720232af726a79d6c5527d8ca96f0acd9772730 Mon Sep 17 00:00:00 2001 +From: wujing +Date: Thu, 25 Mar 2021 16:44:45 +0800 +Subject: [PATCH] fix coredump when inspect container when daemon sets the + ulimit parameters + +Signed-off-by: wujing +--- + src/daemon/modules/service/inspect_container.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/daemon/modules/service/inspect_container.c b/src/daemon/modules/service/inspect_container.c +index abfb8517..d678f7bb 100644 +--- a/src/daemon/modules/service/inspect_container.c ++++ b/src/daemon/modules/service/inspect_container.c +@@ -517,7 +517,7 @@ static container_inspect *pack_inspect_data(const container_t *cont, bool with_h + ERROR("Failed to pack inspect host config data, continue to pack other information"); + } + +- if (merge_default_ulimit_with_ulimit(inspect) != 0) { ++ if (with_host_config && merge_default_ulimit_with_ulimit(inspect) != 0) { + ERROR("Failed to pack default ulimit data, continue to pack other information"); + } + +@@ -622,4 +622,4 @@ out: + inspect = NULL; + } + return inspect; +-} +\ No newline at end of file ++} +-- +2.25.1 + diff --git a/iSulad.spec b/iSulad.spec index fafb358..5db3290 100644 --- a/iSulad.spec +++ b/iSulad.spec @@ -1,5 +1,5 @@ %global _version 2.0.8 -%global _release 20210323.094917.git7e6aa593 +%global _release 20210326.094027.gitac974aa6 %global is_systemd 1 Name: iSulad @@ -65,6 +65,7 @@ Patch50: 0050-devicemapper-umount-when-resize2fs-command-failed.patch Patch51: 0051-ignore-to-create-mtab-when-runtime-is-kata-runtime.patch Patch52: 0052-remove-unchecked-layer-ignore-rootfs-layer.patch Patch53: 0053-add-test-to-check-running-container-with-image-integ.patch +Patch54: 0054-fix-coredump-when-inspect-container-when-daemon-sets.patch %ifarch x86_64 aarch64 Provides: libhttpclient.so()(64bit) @@ -267,6 +268,12 @@ fi %endif %changelog +* Fri Mar 26 2021 zhangxiaoyu - 2.0.8-20210326.094027.gitac974aa6 +- Type: sync from upstream +- ID: NA +- SUG: NA +- DESC: update from master + * Tue Mar 23 2021 haozi007 - 20210323.094917.git7e6aa593 - Type: sync from upstream - ID: NA -- Gitee