!520 remove clean_module_fill_ctx for libisulad_img.so

Merge pull request !520 from zhangxiaoyu/master

0067-remove-clean_module_fill_ctx-for-libisulad_img.so.patch

@@ -0,0 +1,26 @@
+From 1fb9cb0f0e894a2a3b6565b9c69ce4694214910e Mon Sep 17 00:00:00 2001
+From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+Date: Thu, 22 Dec 2022 17:08:20 +0800
+Subject: [PATCH] remove clean_module_fill_ctx for libisulad_img.so
+
+Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+---
+ .../modules/image/oci/storage/rootfs_store/rootfs_store.c       | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/modules/image/oci/storage/rootfs_store/rootfs_store.c b/src/daemon/modules/image/oci/storage/rootfs_store/rootfs_store.c
+index dc1be6c7..1c5d2d84 100644
+--- a/src/daemon/modules/image/oci/storage/rootfs_store/rootfs_store.c
++++ b/src/daemon/modules/image/oci/storage/rootfs_store/rootfs_store.c
+@@ -238,7 +238,7 @@ static int get_containers_from_json()
+ 
+         append_ret = append_container_by_directory(container_path);
+         if (append_ret != 0) {
+-#ifndef DISABLE_CLEANUP
++#if !defined (DISABLE_CLEANUP) && !defined(LIB_ISULAD_IMG_SO)
+             clean_module_fill_ctx(BROKEN_ROOTFS, (void *)container_dirs[i]);
+ #endif
+             ERROR("Found container path but load json failed: %s, deleting...", container_path);
+-- 
+2.25.1
+

iSulad.spec

@@ -1,5 +1,5 @@
 %global _version 2.0.17
-%global _release 13
+%global _release 14
 %global is_systemd 1
 %global enable_shimv2 1
 %global is_embedded 1
@@ -79,6 +79,7 @@ Patch0063: 0063-When-run-options-rm-is-set-delete-the-stoped-contain.patch
 Patch0064: 0064-recheck-kill-command-exit-status.patch
 Patch0065: 0065-start-sandbox-before-setup-network-by-default.patch
 Patch0066: 0066-compatibility-for-manage-pods-which-created-by-old-i.patch
+Patch0067: 0067-remove-clean_module_fill_ctx-for-libisulad_img.so.patch
 
 %ifarch x86_64 aarch64
 Provides:       libhttpclient.so()(64bit)
@@ -305,6 +306,12 @@ fi
 %endif
 
 %changelog
+* Thu Dec 22 2022 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.0.17-14
+- Type: bugfix
+- ID: NA
+- SUG: NA
+- DESC: remove clean_module_fill_ctx for libisulad_img.so
+
 * Mon Dec 19 2022 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.0.17-13
 - Type: bugfix
 - ID: NA