apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

overlay: fix _overlay_config_override of MOUNT_OPTIONS

Browse Source 
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>
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:12 +03:00
committed by Eryu Guan
parent 371f7f52f2
commit 8df8ad0cd2
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/config
+4
View File
@@ -532,6 +532,10 @@ _overlay_config_override()
# Store original base fs vars # Store original base fs vars
export OVL_BASE_TEST_DEV="$TEST_DEV" export OVL_BASE_TEST_DEV="$TEST_DEV"
export OVL_BASE_TEST_DIR="$TEST_DIR" 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" export OVL_BASE_MOUNT_OPTIONS="$MOUNT_OPTIONS"
# Set TEST vars to overlay base and mount dirs inside base fs # Set TEST vars to overlay base and mount dirs inside base fs