diff --git a/kata-containers.spec b/kata-containers.spec index 8cdf524e6311a6ec33f6e5c7a78b75bb9821f743..8ec5fee73770aa6a342e35b0c0abe112daa4fc87 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} %define VERSION 2.1.0 -%define RELEASE 4 +%define RELEASE 5 Name: kata-containers Version: %{VERSION} @@ -108,6 +108,12 @@ strip %{buildroot}/usr/bin/containerd-shim-kata-v2 %doc %changelog +* Mon Sep 27 2021 yangfeiyu - 2.1.0-5 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:chmod agent exec fifo + * Fri Sep 17 2021 yangfeiyu - 2.1.0-4 - Type:enhancement - ID:NA diff --git a/patches/0008-kata-containers-adpat-with-iSulad.patch b/patches/0008-kata-containers-adpat-with-iSulad.patch new file mode 100644 index 0000000000000000000000000000000000000000..5cf487b810bedcf422b94bbdf1747d009b800378 --- /dev/null +++ b/patches/0008-kata-containers-adpat-with-iSulad.patch @@ -0,0 +1,29 @@ +From 5ee8e64c8c620f02cb580f1f3349ae63660ca34c Mon Sep 17 00:00:00 2001 +From: holyfei +Date: Mon, 27 Sep 2021 11:03:58 +0800 +Subject: [PATCH] kata-containers: adpat with iSulad + +reason: chmod the exec fifo to 644, isula start container +and need the permission + +Signed-off-by: holyfei +--- + src/agent/rustjail/src/container.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/agent/rustjail/src/container.rs b/src/agent/rustjail/src/container.rs +index 748ee486..5113a482 100644 +--- a/src/agent/rustjail/src/container.rs ++++ b/src/agent/rustjail/src/container.rs +@@ -822,7 +822,7 @@ impl BaseContainer for LinuxContainer { + if stat::stat(fifo_file.as_str()).is_ok() { + return Err(anyhow!("exec fifo exists")); + } +- unistd::mkfifo(fifo_file.as_str(), Mode::from_bits(0o622).unwrap())?; ++ unistd::mkfifo(fifo_file.as_str(), Mode::from_bits(0o644).unwrap())?; + + fifofd = fcntl::open( + fifo_file.as_str(), +-- +2.23.0 + diff --git a/series.conf b/series.conf index eabe1382d3bdfcac6f1776998f207f36bb989e7b..482704e636160f4421c9d2b1b59a2369bff4f5b4 100644 --- a/series.conf +++ b/series.conf @@ -5,3 +5,4 @@ 0005-runtime-add-the-secure-component-ozone-support-for-h.patch 0006-factory-add-the-template-factory-support-for-hypervi.patch 0007-kata-containers-support-with-iSulad.patch +0008-kata-containers-adpat-with-iSulad.patch