From 665b184d41bce960d0dd7cf1d4bf103d74f71e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AD=A6=E7=A7=AF=E8=B6=85?= <wujichao1@huawei.com>
Date: Fri, 6 Sep 2024 16:25:59 +0800
Subject: [PATCH] unify nri variable format

(cherry picked from commit 52947fb49492f287b4b46dd5a9da0e89a6481abd)
---
 0019-unify-nri-variable-format.patch | 42 ++++++++++++++++++++++++++++
 lcr.spec                             |  9 +++++-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 0019-unify-nri-variable-format.patch

diff --git a/0019-unify-nri-variable-format.patch b/0019-unify-nri-variable-format.patch
new file mode 100644
index 0000000..a9782fb
--- /dev/null
+++ b/0019-unify-nri-variable-format.patch
@@ -0,0 +1,42 @@
+From 6fd7cdec3c383461695f45e96d59353c68ecf286 Mon Sep 17 00:00:00 2001
+From: zhongtao <zhongtao17@huawei.com>
+Date: Wed, 4 Sep 2024 10:38:08 +0800
+Subject: [PATCH 261/261] unify nri variable format
+
+Signed-off-by: zhongtao <zhongtao17@huawei.com>
+---
+ src/json/schema/isulad-daemon-configs.json | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/json/schema/isulad-daemon-configs.json b/src/json/schema/isulad-daemon-configs.json
+index 7b148bd..e21c3cf 100644
+--- a/src/json/schema/isulad-daemon-configs.json
++++ b/src/json/schema/isulad-daemon-configs.json
+@@ -106,19 +106,19 @@
+         "disable-connections" : {
+             "type": "boolean"
+         },
+-        "plugin_config_path": {
++        "plugin-config-path": {
+             "type": "string"
+         },
+-        "plugin_path": {
++        "plugin-path": {
+             "type": "string"
+         },
+-        "nri_socket_path": {
++        "nri-socket-path": {
+             "type": "string"
+         },
+-        "plugin_registration_timeout": {
++        "plugin-registration-timeout": {
+             "type": "uint64"
+         },
+-        "plugin_requst_timeout": {
++        "plugin-requst-timeout": {
+             "type": "uint64"
+         },
+         "image-layer-check": {
+-- 
+2.33.0
+
diff --git a/lcr.spec b/lcr.spec
index 4b25300..3c69c22 100644
--- a/lcr.spec
+++ b/lcr.spec
@@ -1,5 +1,5 @@
 %global _version 2.1.4
-%global _release 10
+%global _release 11
 %global _inner_name isula_libutils
 %global enable_lxc 1
 
@@ -31,6 +31,7 @@ Patch0015: 0015-fix-invalid-args-len-set-in-execute_lxc_attach.patch
 Patch0016: 0016-add-nri-definitions.patch
 Patch0017: 0017-add-struct-for-nri.patch
 Patch0018: 0018-add-nri-def-in-host-config.patch
+Patch0019: 0019-unify-nri-variable-format.patch
 
 %define lxcver_lower 4.0.3-2022102400
 %define lxcver_upper 5.0.3
@@ -151,6 +152,12 @@ rm -rf %{buildroot}
 %{_includedir}/lcr/utils_compile.h
 
 %changelog
+* Fri Sep 6 2024 wujichao<wujichao1@huawei.com> - 2.1.4-11
+- Type:enhancement
+- CVE:NA
+- SUG:NA
+- DESC:unify nri variable format
+
 * Mon Aug 19 2024 zhongtao<zhongtao17@huawei.com> - 2.1.4-10
 - Type:enhancement
 - CVE:NA
-- 
Gitee