From 41cdad6c2d69ece4b9c359db3c6b021f2570d37c Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 17 Jan 2018 10:56:07 +0300 Subject: [PATCH] files: make convert_path_from_another_mp always return relative path If dmi->ns_mountpoint is "/" then in dst we will return "/..." - absolute path but we want here path relative to dmi mount. Adding "./" before the path guaranties that it will be always relative. https://jira.sw.ru/browse/PSBM-72351 Signed-off-by: Pavel Tikhomirov --- criu/files-reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/criu/files-reg.c b/criu/files-reg.c index 13719990a..9c83f2ce4 100644 --- a/criu/files-reg.c +++ b/criu/files-reg.c @@ -1383,7 +1383,7 @@ static void convert_path_from_another_mp(char *src, char *dst, int dlen, * Absolute path to the mount point + difference between source * and destination roots + path relative to the mountpoint. */ - snprintf(dst, dlen, "%s/%s/%s", + snprintf(dst, dlen, "./%s/%s/%s", dmi->ns_mountpoint + 1, smi->root + strlen(dmi->root), src + off);