overlay: use default overlay mount options _overlay_mount_dirs()

Tests that use _overlay_mount_dirs() should also use the
default overlay mount options.
Move mount options from overlay_mount() into _overlay_mount_dirs()
and use helper common_dev_mount_opts() to get options.

OVERLAY_MOUNT_OPTIONS is assigned to MOUNT_OPTIONS, so
there is no need to use OVERLAY_MOUNT_OPTIONS directly.

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-09-27 10:04:10 +03:00
committed by Eryu Guan
parent 8cbd341fb4
commit 510ea29201
+3 -4
View File
@@ -342,7 +342,7 @@ _overlay_mount_dirs()
shift 3
$MOUNT_PROG -t overlay -o lowerdir=$lowerdir -o upperdir=$upperdir \
-o workdir=$workdir $*
-o workdir=$workdir `_common_dev_mount_options $*`
}
_overlay_mkdirs()
@@ -367,9 +367,8 @@ _overlay_mount()
_overlay_mkdirs $dir
_overlay_mount_dirs $dir/$OVL_LOWER $dir/$OVL_UPPER \
$dir/$OVL_WORK $OVERLAY_MOUNT_OPTIONS \
$SELINUX_MOUNT_OPTIONS $* $dir $mnt
_overlay_mount_dirs $dir/$OVL_LOWER $dir/$OVL_UPPER $dir/$OVL_WORK \
$* $dir $mnt
}
_overlay_base_test_mount()