2023-12-21 02:03:18 +00:00
|
|
|
From b94f36b3d06abd711449b2e91303dfdd33f9c979 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: zhongtao <zhongtao17@huawei.com>
|
|
|
|
|
Date: Tue, 21 Nov 2023 21:31:48 +0800
|
|
|
|
|
Subject: [PATCH 30/64] modify daemon json default runtime to runc
|
2023-08-14 02:08:39 +00:00
|
|
|
|
2023-12-21 02:03:18 +00:00
|
|
|
Signed-off-by: zhongtao <zhongtao17@huawei.com>
|
2023-08-14 02:08:39 +00:00
|
|
|
---
|
|
|
|
|
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
|
2023-12-21 02:03:18 +00:00
|
|
|
index 986be41f..9eb471b4 100644
|
2023-08-14 02:08:39 +00:00
|
|
|
--- 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
|
2023-12-21 02:03:18 +00:00
|
|
|
index c11fe218..04485608 100644
|
2023-08-14 02:08:39 +00:00
|
|
|
--- 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
|
2023-12-21 02:03:18 +00:00
|
|
|
index 4faf4057..966e016a 100644
|
2023-08-14 02:08:39 +00:00
|
|
|
--- 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",
|
|
|
|
|
--
|
2023-12-21 02:03:18 +00:00
|
|
|
2.42.0
|
2023-08-14 02:08:39 +00:00
|
|
|
|