Merge ~canonical-kernel-team/+git/overlay-shiftfs-tests:systemd-tmpfiles-race into ~canonical-kernel-team/+git/overlay-shiftfs-tests:main

[Thadeu Lima de Souza Cascardo]

I see a failure on our test that look very similar to the one we had for ovl-mkdir-xattrs. Trying to apply the same type of fix here.

[Sean Feole (sfeole)]

+1

review: Approve

[Po-Hsu Lin (cypressyew)]

Looking good, tested on a VM and it has passed.
Thanks!

review: Approve

diff --git a/tests/ovl-refcnt.sh b/tests/ovl-refcnt.sh
index bb32f01..36baead 100755
--- a/tests/ovl-refcnt.sh
+++ b/tests/ovl-refcnt.sh
@@ -9,27 +9,28 @@ if [ ! -x "$(which lxc)" ]; then
 fi
 
 cat > test.sh <<EOF
+dir=`mktemp -p "${HOME}" -d`
 if [ "$(mount -t proc | grep '/proc')" == "" ]; then
     mount -t proc proc /proc
 fi
-mkdir -p /tmp/ovlissue/mountpointtmp
-mount -t tmpfs tmpfs /tmp/ovlissue/mountpointtmp
+mkdir -p $dir/ovlissue/mountpointtmp
+mount -t tmpfs tmpfs $dir/ovlissue/mountpointtmp
 
-mkdir -p /tmp/ovlissue/mountpointtmp/firstupperdir
-mkdir -p /tmp/ovlissue/mountpointtmp/firstworkdir
-mkdir -p /tmp/ovlissue/mountpointtmp/firstunion
-mount -t overlay overlay -o lowerdir=/,upperdir=/tmp/ovlissue/mountpointtmp/firstupperdir,workdir=/tmp/ovlissue/mountpointtmp/firstworkdir /tmp/ovlissue/mountpointtmp/firstunion
+mkdir -p $dir/ovlissue/mountpointtmp/firstupperdir
+mkdir -p $dir/ovlissue/mountpointtmp/firstworkdir
+mkdir -p $dir/ovlissue/mountpointtmp/firstunion
+mount -t overlay overlay -o lowerdir=/,upperdir=$dir/ovlissue/mountpointtmp/firstupperdir,workdir=$dir/ovlissue/mountpointtmp/firstworkdir $dir/ovlissue/mountpointtmp/firstunion
 
-mkdir -p /tmp/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp
-mount --bind  /tmp/ovlissue/mountpointtmp /tmp/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp
+mkdir -p $dir/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp
+mount --bind  $dir/ovlissue/mountpointtmp $dir/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp
 
-mkdir /tmp/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/secondupperdir
-mkdir /tmp/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/workdir
-mkdir /tmp/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/secondunion
-mount -t overlay overlay -o lowerdir=/tmp/ovlissue/mountpointtmp/firstunion,upperdir=/tmp/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/secondupperdir,workdir=/tmp/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/workdir /tmp/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/secondunion
+mkdir $dir/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/secondupperdir
+mkdir $dir/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/workdir
+mkdir $dir/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/secondunion
+mount -t overlay overlay -o lowerdir=$dir/ovlissue/mountpointtmp/firstunion,upperdir=$dir/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/secondupperdir,workdir=$dir/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/workdir $dir/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/secondunion
 
-chroot /tmp/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/secondunion true
-umount /tmp/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/secondunion
+chroot $dir/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/secondunion true
+umount $dir/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/secondunion
 EOF
 
 sudo lxd init --auto