From 10da1303d6ff440989d9bd5aa60d5747f8290dfd Mon Sep 17 00:00:00 2001
From: Andrey Vagin <avagin@openvz.org>
Date: Tue, 31 Dec 2013 13:54:53 +0400
Subject: [PATCH] mounts/ext: fix path to the test file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[root@avagin-fc19-cr ext]# bash run.sh
+ make
make: Nothing to be done for `all'.
+ criu=../../../criu
+ finf=finish
+ outf=run_output
+ pidfile=pid_wait
+ tempd=temp_dir
+ sfile=source_file
+ tdir=test_dir
+ dfile=dest_file
+ mesg=msg-35
+ export finf
+ export outf
+ export pidfile
+ export sfile
+ export dfile
+ export tempd
+ export mesg
+ export tdir
+ mkdir dump/
mkdir: cannot create directory ‘dump/’: File exists
+ mkdir test_dir
mkdir: cannot create directory ‘test_dir’: File exists
+ mount --bind / test_dir
+ mount --make-rprivate test_dir
+ unshare --mount ./run_ns.sh
+ set -e
+ odir=mexold
++ pwd
+ cur=/root/crtools/test/mounts/ext
+ mount --make-rprivate /
+ rm -rf temp_dir finish run_output /mexold
+ mkdir temp_dir
+ touch test_dir/dest_file
+ mount -t tmpfs none temp_dir
+ echo msg-35
+ mount --bind temp_dir/source_file
test_dir//root/crtools/test/mounts/ext/test_dir/dest_file
mount: mount point
test_dir//root/crtools/test/mounts/ext/test_dir/dest_file does not exist
+ fail 'Can'\''t unshare ns'
+ echo 'Can'\''t' unshare ns
Can't unshare ns
+ exit 1

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
---
 test/mounts/ext/run_ns.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/mounts/ext/run_ns.sh b/test/mounts/ext/run_ns.sh
index ca976754f..65277658e 100755
--- a/test/mounts/ext/run_ns.sh
+++ b/test/mounts/ext/run_ns.sh
@@ -18,7 +18,7 @@ mount --make-rprivate "/"
 # Clean previous stuff
 rm -rf "$tempd" "$finf" "$outf" "/$odir"
 mkdir "$tempd"
-touch "$tdir/$dfile"
+touch "$tdir/$cur/$tdir/$dfile"
 
 # Create source file. Make it on a new mountpoint to "hide"
 # it in the target mount tree (see below)