[1/2] overlay: do not set OVL_BASE_FSTYP value to "overlay"
diff mbox series

Message ID 1535394566-18837-2-git-send-email-amir73il@gmail.com
State New
Headers show
Series
  • fstests: fix overlay test failure over ext4
Related show

Commit Message

Amir Goldstein Aug. 27, 2018, 6:29 p.m. UTC
The purpose of OVL_BASE_FSTYP is to store the value of FSTYP that is
found in a host config file section.

When there is no host config file or if user sets FSTYP=overlay in config
file, it makes no sense to store the value "overlay" in OVL_BASE_FSTYP
and it is better to leave it empty or leave its current value in tact.

This allows user to set OVL_BASE_FSTYP in config file or before running
the test to support queries about base fs, such as
_require_metadata_journaling, even when running an overlay test.

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

Patch
diff mbox series

diff --git a/common/config b/common/config
index 2f1f272..d85519a 100644
--- a/common/config
+++ b/common/config
@@ -530,7 +530,7 @@  _overlay_config_override()
 	[ -b "$TEST_DEV" ] || return 0
 
 	# Config file may specify base fs type, but we obay -overlay flag
-	export OVL_BASE_FSTYP="$FSTYP"
+	[ "$FSTYP" == overlay ] || export OVL_BASE_FSTYP="$FSTYP"
 	export FSTYP=overlay
 
 	# Store original base fs vars