lxc/0054-fix-invalid-log-message.patch
LiFeng 7b470b3cde lxc: internal change at 1.6
Change-Id: I5821dc8a44f724e59cee65e356dfae4fbae04f76
Signed-off-by: LiFeng <lifeng68@huawei.com>
2020-01-05 22:20:49 -05:00

43 lines
1.2 KiB
Diff

From 18727f1d50acf2a01e3f593e016ffdb06cef7f16 Mon Sep 17 00:00:00 2001
From: liuhao <liuhao27@huawei.com>
Date: Tue, 22 Jan 2019 20:14:53 +0800
Subject: [PATCH 054/138] 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 6ea8f9c..1e403eb 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 24e975b..4db61c5 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);
--
1.8.3.1