!591 modify daemon json default runtime to runc

* modify daemon json default runtime to runc

6002-modify-daemon-json-default-runtime-to-runc.patch

@@ -0,0 +1,52 @@
+From 4b35e4f4d39d3c4ea0caed90518e93cb1a805218 Mon Sep 17 00:00:00 2001
+From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+Date: Mon, 14 Aug 2023 09:48:38 +0800
+Subject: [PATCH] modify daemon json default runtime to runc
+
+Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+---
+ src/cmd/isula/base/create.h    | 2 +-
+ src/cmd/isula/extend/stats.c   | 1 -
+ src/contrib/config/daemon.json | 2 +-
+ 3 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/cmd/isula/base/create.h b/src/cmd/isula/base/create.h
+index 0426158..6fff764 100644
+--- a/src/cmd/isula/base/create.h
++++ b/src/cmd/isula/base/create.h
+@@ -332,7 +332,7 @@ extern "C" {
+       "runtime",                                                                                                                                          \
+       'R',                                                                                                                                                \
+       &(cmdargs).runtime,                                                                                                                                 \
+-      "Runtime to use for containers(default: lcr)",                                                                                                      \
++      "Runtime to use for containers",                                                                                                      \
+       NULL },                                                                                                                                             \
+     { CMD_OPT_TYPE_STRING_DUP,                                                                                                                            \
+       false,                                                                                                                                              \
+diff --git a/src/cmd/isula/extend/stats.c b/src/cmd/isula/extend/stats.c
+index c11fe21..0448560 100644
+--- a/src/cmd/isula/extend/stats.c
++++ b/src/cmd/isula/extend/stats.c
+@@ -41,7 +41,6 @@ struct client_arguments g_cmd_stats_args = {
+     .showall = false,
+     .nostream = false,
+     .original = false,
+-    .runtime = "lcr",
+ };
+ 
+ static struct isula_stats_response *g_oldstats = NULL;
+diff --git a/src/contrib/config/daemon.json b/src/contrib/config/daemon.json
+index f8cad24..711dda9 100644
+--- a/src/contrib/config/daemon.json
++++ b/src/contrib/config/daemon.json
+@@ -1,6 +1,6 @@
+ {
+     "group": "isula",
+-    "default-runtime": "lcr",
++    "default-runtime": "runc",
+     "graph": "/var/lib/isulad",
+     "state": "/var/run/isulad",
+     "log-level": "ERROR",
+-- 
+2.25.1
+

iSulad.spec

@@ -1,5 +1,5 @@
 %global _version 2.1.2
-%global _release 5
+%global _release 6
 %global is_systemd 1
 %global enable_shimv2 1
 %global is_embedded 1
@@ -29,7 +29,9 @@ Patch0012:	0012-fix-hugetlbs-malloc-length.patch
 Patch0013:	0013-fix-forget-to-set-return-value.patch
 Patch0014:	0014-ensure-define-in-local-and-use-correctly-type.patch
 Patch0015:	0015-Revert-the-changes-in-util_smart_calloc_s.patch
-Patch0016:	0016-fix-execlp-not-enough-args.patch
+
+Patch6001:	6001-fix-execlp-not-enough-args.patch
+Patch6002:	6002-modify-daemon-json-default-runtime-to-runc.patch
 
 %ifarch x86_64 aarch64
 Provides:       libhttpclient.so()(64bit)
@@ -61,7 +63,6 @@ BuildRequires: gtest-devel gmock-devel
 %define lcrver_lower 2.1.1-0
 %define lcrver_upper 2.1.2-0
 
-BuildRequires: lcr-devel > %{lcrver_lower} lcr-devel < %{lcrver_upper}
 BuildRequires: libisula-devel > %{lcrver_lower} libisula-devel < %{lcrver_upper}
 BuildRequires: cmake gcc-c++ yajl-devel lxc lxc-devel
 BuildRequires: grpc grpc-plugins grpc-devel protobuf-devel
@@ -76,7 +77,6 @@ BuildRequires: lib-shim-v2 lib-shim-v2-devel
 
 
 Requires:      libisula > %{lcrver_lower} libisula < %{lcrver_upper}
-Requires:      lcr > %{lcrver_lower} lcr < %{lcrver_upper}
 Requires:      grpc protobuf lxc
 Requires:      libcurl
 Requires:      http-parser libseccomp
@@ -274,6 +274,12 @@ fi
 %endif
 
 %changelog
+* Wed Aug 09 2023 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.1.2-6
+- Type: bugfix
+- ID: NA
+- SUG: NA
+- DESC: modify daemon json default runtime to runc
+
 * Thu Jul 20 2023 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.1.2-5
 - Type: bugfix
 - ID: NA