43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From 5b16103c5148098f737c2b7827805d9e35209ed9 Mon Sep 17 00:00:00 2001
|
|
From: liuhao <liuhao27@huawei.com>
|
|
Date: Tue, 22 Jan 2019 20:14:53 +0800
|
|
Subject: [PATCH 054/131] fix invalid log message
|
|
|
|
fix invalid log message
|
|
|
|
Signed-off-by: liuhao <liuhao27@huawei.com>
|
|
Signed-off-by: LiFeng <lifeng68@huawei.com>
|
|
---
|
|
src/lxc/conf.c | 1 -
|
|
src/lxc/utils.c | 2 +-
|
|
2 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
|
|
index 6ea8f9c1..1e403ebb 100644
|
|
--- a/src/lxc/conf.c
|
|
+++ b/src/lxc/conf.c
|
|
@@ -2708,7 +2708,6 @@ static int mount_file_entries(const struct lxc_conf *conf,
|
|
free(mntent.mnt_fsname);
|
|
return -1;
|
|
}
|
|
- ERROR("mntent.mnt_fsname:%s, mntent.mnt_dir:%s", mntent.mnt_fsname, mntent.mnt_dir);
|
|
if (!rootfs->path)
|
|
ret = mount_entry_on_systemfs(&mntent);
|
|
else if (mntent.mnt_dir[0] != '/')
|
|
diff --git a/src/lxc/utils.c b/src/lxc/utils.c
|
|
index 24e975bc..4db61c56 100644
|
|
--- a/src/lxc/utils.c
|
|
+++ b/src/lxc/utils.c
|
|
@@ -1777,7 +1777,7 @@ int recursive_destroy(char *dirname)
|
|
dir = opendir(dirname);
|
|
if (!dir) {
|
|
if (errno == ENOENT) {
|
|
- WARN("Destroy path: %s do not exist");
|
|
+ WARN("Destroy path: \"%s\" do not exist", dirname);
|
|
return 0;
|
|
}
|
|
SYSERROR("Failed to open dir \"%s\"", dirname);
|
|
--
|
|
2.23.0
|
|
|