From 76de15dd1e4d712b5885dced546f782ce3b33bf3 Mon Sep 17 00:00:00 2001
From: dongyuzhen <dongyuzhen@h-partners.com>
Date: Mon, 12 May 2025 15:51:45 +0800
Subject: [PATCH] sync from upstream

(cherry picked from commit 7fdf2c7f150be6dd38ff289f4128f41c3d78c643)
---
 0026-sandboxer-add-image-type.patch           | 42 ++++++++++++++++++
 ...work_ready-from-metadata-to-state-fo.patch | 44 +++++++++++++++++++
 lcr.spec                                      | 10 ++++-
 3 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 0026-sandboxer-add-image-type.patch
 create mode 100644 0027-move-sandbox-network_ready-from-metadata-to-state-fo.patch

diff --git a/0026-sandboxer-add-image-type.patch b/0026-sandboxer-add-image-type.patch
new file mode 100644
index 0000000..8c57554
--- /dev/null
+++ b/0026-sandboxer-add-image-type.patch
@@ -0,0 +1,42 @@
+From caae9c01e8ee2d30c343ef1f79a6a0b7835e3d60 Mon Sep 17 00:00:00 2001
+From: liuxu <liuxu156@huawei.com>
+Date: Sat, 8 Feb 2025 16:40:26 +0800
+Subject: [PATCH] sandboxer:add image type
+
+Signed-off-by: liuxu <liuxu156@huawei.com>
+---
+ src/json/schema/container/sandbox-info.json | 3 +++
+ src/json/schema/defs.json                   | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/src/json/schema/container/sandbox-info.json b/src/json/schema/container/sandbox-info.json
+index 1d5954a..ccff6a4 100644
+--- a/src/json/schema/container/sandbox-info.json
++++ b/src/json/schema/container/sandbox-info.json
+@@ -5,6 +5,9 @@
+ 		"sandboxer": {
+ 			"type": "string"
+ 		},
++		"ImageType": {
++			"type": "string"
++		},
+ 		"id": {
+ 			"type": "string"
+ 		},
+diff --git a/src/json/schema/defs.json b/src/json/schema/defs.json
+index b313103..329d34a 100644
+--- a/src/json/schema/defs.json
++++ b/src/json/schema/defs.json
+@@ -315,6 +315,9 @@
+                         },
+                         "address": {
+                             "type": "string"
++                        },
++                        "image-type": {
++                            "type": "string"
+                         }
+                     }
+                 }
+-- 
+2.34.1
+
diff --git a/0027-move-sandbox-network_ready-from-metadata-to-state-fo.patch b/0027-move-sandbox-network_ready-from-metadata-to-state-fo.patch
new file mode 100644
index 0000000..d3278d5
--- /dev/null
+++ b/0027-move-sandbox-network_ready-from-metadata-to-state-fo.patch
@@ -0,0 +1,44 @@
+From b97efe68935c239fe539aa933ee4389ed73c8ec3 Mon Sep 17 00:00:00 2001
+From: zhongtao <zhongtao17@huawei.com>
+Date: Sat, 22 Feb 2025 10:48:24 +1400
+Subject: [PATCH] move sandbox network_ready from metadata to state for save
+ optimization
+
+Signed-off-by: zhongtao <zhongtao17@huawei.com>
+---
+ src/json/schema/sandbox/metadata.json | 3 ---
+ src/json/schema/sandbox/state.json    | 3 +++
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/json/schema/sandbox/metadata.json b/src/json/schema/sandbox/metadata.json
+index b3b6886..df9f6ab 100644
+--- a/src/json/schema/sandbox/metadata.json
++++ b/src/json/schema/sandbox/metadata.json
+@@ -31,9 +31,6 @@
+       "netNsPath": {
+         "type": "string"
+       },
+-      "networkReady": {
+-        "type": "boolean"
+-      },
+      "sandboxConfigJson": {
+         "type": "string"
+      }
+diff --git a/src/json/schema/sandbox/state.json b/src/json/schema/sandbox/state.json
+index ceb62b2..2eea0bc 100644
+--- a/src/json/schema/sandbox/state.json
++++ b/src/json/schema/sandbox/state.json
+@@ -19,6 +19,9 @@
+         },
+         "Status": {
+             "type": "integer"
++        },
++        "networkReady": {
++            "type": "boolean"
+         }
+     }
+ }
+\ No newline at end of file
+-- 
+2.43.0
+
diff --git a/lcr.spec b/lcr.spec
index 958e7d8..efc4bbd 100644
--- a/lcr.spec
+++ b/lcr.spec
@@ -1,5 +1,5 @@
 %global _version 2.1.4
-%global _release 13
+%global _release 14
 %global _inner_name isula_libutils
 %global enable_lxc 1
 
@@ -38,6 +38,8 @@ Patch0022: 0022-json-schema-for-sandbox-api.patch
 Patch0023: 0023-add-no-pivot-root-config.patch
 Patch0024: 0024-Use-any-type-instead-of-bytearray.patch
 Patch0025: 0025-fix-issues-Isula-ps-cannot-display-port-mapping.patch
+Patch0026: 0026-sandboxer-add-image-type.patch
+Patch0027: 0027-move-sandbox-network_ready-from-metadata-to-state-fo.patch
 
 %define lxcver_lower 4.0.3-2022102400
 %define lxcver_upper 5.0.3
@@ -159,6 +161,12 @@ rm -rf %{buildroot}
 %{_includedir}/lcr/utils_compile.h
 
 %changelog
+* Mon May 12 2025 dongyuzhen <dongyuzhen@h-partners.com> - 2.1.4-14
+- Type:enhancement
+- CVE:NA
+- SUG:NA
+- DESC:sync from upstream
+
 * Mon Nov 25 2024 liuxu<liuxu156@huawei.com> - 2.1.4-13
 - Type:enhancement
 - CVE:NA