runc/patch/0006-runc-ignore-exec.fifo-removing-not-exist-error.patch

29 lines
792 B
Diff
Raw Normal View History

2023-07-26 17:09:55 +08:00
From 5516836a74e12756161cd3a6ef7e05c7e89c378c Mon Sep 17 00:00:00 2001
2022-10-26 16:13:47 +08:00
From: zhongjiawei <zhongjiawei1@huawei.com>
2023-07-26 17:09:55 +08:00
Date: Mon, 24 Jul 2023 16:40:27 +0800
2022-10-26 16:13:47 +08:00
Subject: [PATCH] runc: ignore exec.fifo removing not exist error
---
2023-01-05 17:11:59 +08:00
libcontainer/container_linux.go | 5 ++++-
2022-10-26 16:13:47 +08:00
1 file changed, 4 insertions(+), 1 deletion(-)
2023-01-05 17:11:59 +08:00
diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go
2023-07-26 17:09:55 +08:00
index 5f1a494..f8ce1cc 100644
2023-01-05 17:11:59 +08:00
--- a/libcontainer/container_linux.go
+++ b/libcontainer/container_linux.go
2023-07-26 17:09:55 +08:00
@@ -327,7 +327,10 @@ func handleFifoResult(result openResult) error {
2022-10-26 16:13:47 +08:00
if err := readFromExecFifo(f); err != nil {
return err
}
- return os.Remove(f.Name())
+ if err := os.Remove(f.Name()); !os.IsNotExist(err) {
+ return err
+ }
+ return nil
}
type openResult struct {
--
2023-07-26 17:09:55 +08:00
2.33.0
2022-10-26 16:13:47 +08:00