60 lines
2.5 KiB
Diff
60 lines
2.5 KiB
Diff
|
From 27ee841b8ee02a5e87c0d0754fb0bd13b1e986f8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: gaojiazhen <gaojiazhen_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Thu, 23 Nov 2023 18:23:10 +0000
|
||
|
|
Subject: [PATCH 11/13] =?UTF-8?q?update=20src/runtime/lcrcontainer.c.=201?=
|
||
|
|
=?UTF-8?q?=E3=80=81=E4=BD=BF=E4=B8=8A=E4=B8=8B=E6=96=87=E7=9A=84=E5=8A=A8?=
|
||
|
|
=?UTF-8?q?=E8=AF=8D=E6=97=B6=E6=80=81=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
|
||
|
|
=?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=AD=A3114=E8=A1=8C=E7=9A=84=E2=80=9Cunlink?=
|
||
|
|
=?UTF-8?q?=E2=80=9D=E4=B8=BA=E2=80=9Cunlinking=E2=80=9D=E3=80=82=202?=
|
||
|
|
=?UTF-8?q?=E3=80=81=E8=A7=84=E8=8C=83SYSERROR=E5=86=85=E5=AE=B9=E7=9A=84?=
|
||
|
|
=?UTF-8?q?=E8=AF=AD=E6=B3=95=EF=BC=8C=E4=BF=AE=E6=AD=A3215=E8=A1=8C?=
|
||
|
|
=?UTF-8?q?=E7=9A=84=E2=80=9Callocated=E2=80=9D=E4=B8=BA=E2=80=9Callocated?=
|
||
|
|
=?UTF-8?q?=E2=80=9D=E3=80=82=203=E3=80=81=E4=BD=BF=E4=B8=8A=E4=B8=8B?=
|
||
|
|
=?UTF-8?q?=E6=96=87=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E7=9A=84?=
|
||
|
|
=?UTF-8?q?=E7=94=A8=E6=B3=95=E4=B8=80=E8=87=B4=EF=BC=8C=E4=BF=AE=E6=AD=A3?=
|
||
|
|
=?UTF-8?q?241=E8=A1=8C=E7=9A=84=E2=80=9Cbegin"=E4=B8=BA=E2=80=9CBegin?=
|
||
|
|
=?UTF-8?q?=E2=80=9D=E3=80=82?=
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Signed-off-by: gaojiazhen <gaojiazhen_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
src/runtime/lcrcontainer.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/runtime/lcrcontainer.c b/src/runtime/lcrcontainer.c
|
||
|
|
index 0b430ca..f93afb8 100644
|
||
|
|
--- a/src/runtime/lcrcontainer.c
|
||
|
|
+++ b/src/runtime/lcrcontainer.c
|
||
|
|
@@ -111,7 +111,7 @@ static void remove_partial(const struct lxc_container *c)
|
||
|
|
goto out_free;
|
||
|
|
}
|
||
|
|
if (unlink(path) < 0) {
|
||
|
|
- SYSERROR("Error unlink partial file %s", path);
|
||
|
|
+ SYSERROR("Error unlinking partial file %s", path);
|
||
|
|
}
|
||
|
|
|
||
|
|
out_free:
|
||
|
|
@@ -212,7 +212,7 @@ static bool lcr_start_check_config(const char *lcrpath, const char *name)
|
||
|
|
|
||
|
|
nret = snprintf(config, sizeof(config), "%s/%s/config", lcrpath, name);
|
||
|
|
if (nret < 0 || (size_t)nret >= sizeof(config)) {
|
||
|
|
- SYSERROR("Failed to allocated memory");
|
||
|
|
+ SYSERROR("Failed to allocate memory");
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -238,7 +238,7 @@ static bool wait_start_pid(pid_t pid, int rfd, const char *name, const char *pat
|
||
|
|
// set default error
|
||
|
|
lcr_set_error_message(LCR_ERR_RUNTIME, "runtime error");
|
||
|
|
|
||
|
|
- INFO("begin to stop container\n");
|
||
|
|
+ INFO("Begin to stop container\n");
|
||
|
|
if (!lcr_kill(name, path, SIGKILL)) {
|
||
|
|
ERROR("Failed to stop container");
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|