From: Amir Goldstein Date: Mon, 27 Aug 2018 18:29:25 +0000 (+0300) Subject: overlay: do not set OVL_BASE_FSTYP value to "overlay" X-Git-Tag: v2022.05.01~1430 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c68495cd99f40b010b674b2eee141d6972475bda;p=users%2Fhch%2Fxfstests-dev.git overlay: do not set OVL_BASE_FSTYP value to "overlay" 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 Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/common/config b/common/config index 2f1f27206..d85519a8c 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