From e45819fcb4a96649a4030db7684f140d5ca46735 Mon Sep 17 00:00:00 2001 From: CoprDistGit Date: Tue, 3 Sep 2024 03:24:28 +0000 Subject: automatic import of iSulad --- ...move-extra-s-in-CreateContainerLogSymlink.patch | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 0077-remove-extra-s-in-CreateContainerLogSymlink.patch (limited to '0077-remove-extra-s-in-CreateContainerLogSymlink.patch') diff --git a/0077-remove-extra-s-in-CreateContainerLogSymlink.patch b/0077-remove-extra-s-in-CreateContainerLogSymlink.patch new file mode 100644 index 0000000..571f47c --- /dev/null +++ b/0077-remove-extra-s-in-CreateContainerLogSymlink.patch @@ -0,0 +1,26 @@ +From cade2ae3b53848bbedb3f89ff45333f3871e878a Mon Sep 17 00:00:00 2001 +From: jikai +Date: Thu, 25 Apr 2024 12:46:10 +0000 +Subject: [PATCH 77/78] remove extra %s in CreateContainerLogSymlink + +Signed-off-by: jikai +--- + src/daemon/common/cri/cri_helpers.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/daemon/common/cri/cri_helpers.cc b/src/daemon/common/cri/cri_helpers.cc +index 5189ac00..d7ec9f36 100644 +--- a/src/daemon/common/cri/cri_helpers.cc ++++ b/src/daemon/common/cri/cri_helpers.cc +@@ -552,7 +552,7 @@ void CreateContainerLogSymlink(const std::string &containerID, Errors &error) + if (symlink(realPath.c_str(), path.c_str()) != 0) { + SYSERROR("failed to create symbolic link %s to the container log file %s for container %s", path.c_str(), realPath.c_str(), + containerID.c_str()); +- error.Errorf("failed to create symbolic link %s to the container log file %s for container %s: %s", path.c_str(), ++ error.Errorf("failed to create symbolic link %s to the container log file %s for container %s", path.c_str(), + realPath.c_str(), containerID.c_str()); + } + } +-- +2.25.1 + -- cgit v1.2.3