diff options
Diffstat (limited to '6002-modify-daemon-json-default-runtime-to-runc.patch')
| -rw-r--r-- | 6002-modify-daemon-json-default-runtime-to-runc.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/6002-modify-daemon-json-default-runtime-to-runc.patch b/6002-modify-daemon-json-default-runtime-to-runc.patch new file mode 100644 index 0000000..fcc27ac --- /dev/null +++ b/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 + |