packages/iSulad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!126 iSulad: sync with upstream iSulad

Browse Source 
From: @zh_xiaoyu
Reviewed-by: @lifeng2221dd1
Signed-off-by: @lifeng2221dd1
This commit is contained in:
openeuler-ci-bot 2021-03-26 14:07:31 +08:00 committed by Gitee
commit 5288ed9289
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0054-fix-coredump-when-inspect-container-when-daemon-sets.patch Normal file
View File

@ -0,0 +1,34 @@
From c720232af726a79d6c5527d8ca96f0acd9772730 Mon Sep 17 00:00:00 2001
From: wujing <wujing50@huawei.com>
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 <wujing50@huawei.com>
---
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

9
iSulad.spec
View File

@ -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 <zhangxiaoyu58@huawei.com> - 2.0.8-20210326.094027.gitac974aa6
- Type: sync from upstream
- ID: NA
- SUG: NA
- DESC: update from master
* Tue Mar 23 2021 haozi007 <liuhao27@huawei.com> - 20210323.094917.git7e6aa593
- Type: sync from upstream
- ID: NA