[PATCH 4/4] overlay: fix _overlay_config_override of MOUNT_OPTIONS

Amir Goldstein
2017-09-27T07:03:46Z

The config variable OVERLAY_MOUNT_OPTIONS is used to configure
the overlay mount options when running ./check -overlay.
The config variable MOUNT_OPTIONS is used to configure the
mount options for base fs.

If config sets value of OVERLAY_MOUNT_OPTIONS and
does not set MOUNT_OPTIONS, the value of MOUNT_OPTIONS
may be leftover from previous _overlay_config_override, so
don't use that value for base fs mount.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
common/config | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/common/config b/common/config
index 71798f0..8844173 100644
--- a/common/config
+++ b/common/config
@@ -532,6 +532,10 @@ _overlay_config_override()
# Store original base fs vars
export OVL_BASE_TEST_DEV="$TEST_DEV"
export OVL_BASE_TEST_DIR="$TEST_DIR"
+ # If config does not set MOUNT_OPTIONS, its value may be
+ # leftover from previous _overlay_config_override, so
+ # don't use that value for base fs mount
+ [ "$MOUNT_OPTIONS" != "$OVERLAY_MOUNT_OPTIONS" ] || unset MOUNT_OPTIONS
export OVL_BASE_MOUNT_OPTIONS="$MOUNT_OPTIONS"

# Set TEST vars to overlay base and mount dirs inside base fs
--
2.7.4