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: nicer report when features are not supported

Browse Source 
Commit ea7ad43 ("fstests: implement require of multiple overlayfs
features") changed the message when tests are not run due to missing
overlayfs feature.

Restore the check for existing module param before trying to mount
which restores the old message format, e.g.:

[not run] feature 'metacopy' not supported by overlay

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Amir Goldstein
2018-06-01 13:44:16 +03:00
committed by Eryu Guan
parent b96c9912a7
commit 668a411a73
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/overlay
+5 -4
View File
@@ -140,9 +140,6 @@ __check_scratch_overlay_feature()
# configurable from Kconfig (the build default), by module
# parameter (the system default) and per mount by mount
# option ${feature}=[on|off].
#
# If the module parameter does not exist then there is no
# point in checking the mount option.
local default=`_get_fs_module_param ${feature}`
[ "$default" = Y ] || [ "$default" = N ] || \
_notrun "feature '${feature}' not supported by ${FSTYP}"
@@ -164,12 +161,16 @@ _require_scratch_overlay_features()
local opts="rw"
for feature in ${features[*]}; do
# If the module parameter does not exist then there is no
# point in checking the mount option.
_get_fs_module_param ${feature} > /dev/null 2>&1 || \
_notrun "feature '${feature}' not supported by overlay"
opts+=",${feature}=on"
done
_scratch_mkfs > /dev/null 2>&1
_try_scratch_mount -o $opts || \
_notrun "overlay options '$opts' cannot be enabled on ${SCRATCH_DEV}"
_notrun "overlay features '${features[*]}' cannot be enabled on ${SCRATCH_DEV}"
for feature in ${features[*]}; do
__check_scratch_overlay_feature ${feature}