diff options
| author | CoprDistGit <infra@openeuler.org> | 2024-09-03 03:24:28 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2024-09-03 03:24:28 +0000 |
| commit | e45819fcb4a96649a4030db7684f140d5ca46735 (patch) | |
| tree | 544dac3e30a0448eabdc50add41aa3a18982d9f1 /0063-remove-default-systemd-cgroup-and-enable-cri-v1-valu.patch | |
| parent | 1a71e3afebb4b43be63949dcc8e882fe7643f13b (diff) | |
automatic import of iSuladopeneuler24.03_LTS
Diffstat (limited to '0063-remove-default-systemd-cgroup-and-enable-cri-v1-valu.patch')
| -rw-r--r-- | 0063-remove-default-systemd-cgroup-and-enable-cri-v1-valu.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/0063-remove-default-systemd-cgroup-and-enable-cri-v1-valu.patch b/0063-remove-default-systemd-cgroup-and-enable-cri-v1-valu.patch new file mode 100644 index 0000000..b6a0e6b --- /dev/null +++ b/0063-remove-default-systemd-cgroup-and-enable-cri-v1-valu.patch @@ -0,0 +1,27 @@ +From c092597565e5f24b29ecd83b4b371a19a9c2db0d Mon Sep 17 00:00:00 2001 +From: jikai <jikai11@huawei.com> +Date: Wed, 17 Apr 2024 01:52:45 +0000 +Subject: [PATCH 63/69] remove default systemd-cgroup and enable-cri-v1 value + in daemon.json + +Signed-off-by: jikai <jikai11@huawei.com> +--- + src/contrib/config/daemon.json | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/contrib/config/daemon.json b/src/contrib/config/daemon.json +index 69362c26..711dda94 100644 +--- a/src/contrib/config/daemon.json ++++ b/src/contrib/config/daemon.json +@@ -35,7 +35,5 @@ + "insecure-skip-verify-enforce": false, + "cri-runtimes": { + "kata": "io.containerd.kata.v2" +- }, +- "enable-cri-v1": false, +- "systemd-cgroup": false ++ } + } +-- +2.34.1 + |