From 668a411a739c44a2f8bed45cb0fea23d0f6ef08d Mon Sep 17 00:00:00 2001 From: Amir Goldstein Date: Fri, 1 Jun 2018 13:44:16 +0300 Subject: [PATCH] overlay: nicer report when features are not supported 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 Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- common/overlay | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/common/overlay b/common/overlay index e99e64f4..b526f24d 100644 --- a/common/overlay +++ b/common/overlay @@ -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} -- 2.30.2