overlay: use OVL_BASE_SCRATCH_MNT instead of SCRATCH_DEV

Use the new var OVL_BASE_SCRATCH_MNT to refer to overlay
base dir instead of the legacy SCRATCH_DEV var.

In overlay/011, when using MOUNT_PROG directly, provide
OVL_BASE_SCRATCH_MNT as device argument instead of 'none'.
This fix is required to support mount of base fs.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Amir Goldstein
2017-02-28 14:18:37 +02:00
committed by Eryu Guan
parent 2ab614524d
commit 33e4199895
26 changed files with 64 additions and 65 deletions
+2 -2
View File
@@ -56,13 +56,13 @@ _require_user
_scratch_mkfs
# Create test file on lower dir, and chown to fsgqa user
lowerdir=$SCRATCH_DEV/$OVL_LOWER
lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER
mkdir -p $lowerdir
touch $lowerdir/testfile
chown fsgqa:fsgqa $lowerdir/testfile
# chown upperdir to fsgqa user, so new file/dir can be created by the user
upperdir=$SCRATCH_DEV/$OVL_UPPER
upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER
mkdir -p $upperdir
chown fsgqa:fsgqa $upperdir