util/get-config: stop sourcing deprecated config files
PATCH 1/1 util/get-config: stop sourcing deprecated config files
Stop sourcing configs from the deprecated locations $KVM_CONFIG or kvm-xfstests/config.custom, in preference to the locations in ~/.config/. kvm-xfstests and gce-xfstests have been warning when sourcing from the deprecated locations for almost a year now, so it's unlikely that anyone is using them anymore.
Signed-off-by Eric Biggers <[email protected]>
--- kvm-xfstests/util/get-config | 15 --------------- 1 file changed, 15 deletions(-)
kvm-xfstests/util/get-config +0 -15
@@ -48,21 +48,6 @@ then rm "$tmpfile" unset tmpfile fi - if test -n "$GCE_ACCOUNT" -a -f "$DIR/config-$GCE_ACCOUNT" ; then . "$DIR/config-$GCE_ACCOUNT" -elif test -f $DIR/config.custom ; then -# Else, source kvm-xfstests/config.custom if present (deprecated) - echo -e 1>&2 "Warning: use of kvm-xfstests/config.custom is deprecated." \ - "Move your settings\n into ~/.config/kvm-xfstests," \ - "~/.config/gce-xfstests,\n ~/.config/android-xfstests," \ - "and/or ~/.config/xfstests-common" - . $DIR/config.custom -fi - -# Source $KVM_CONFIG if present (deprecated) -if test -n "$KVM_CONFIG" -a -f "$KVM_CONFIG"; then - echo -e 1>&2 "Warning: use of \$KVM_CONFIG is deprecated." \ - "Move your settings into\n ~/.config/kvm-xfstests" - . $KVM_CONFIG fi
Signature · 1 line
2.17.0.484.g0c8726318c-goog
Theodore Y. Ts'o
AppliedQuoted 7 lines · Eric Biggers
Stop sourcing configs from the deprecated locations $KVM_CONFIG or kvm-xfstests/config.custom, in preference to the locations in ~/.config/. kvm-xfstests and gce-xfstests have been warning when sourcing from the deprecated locations for almost a year now, so it's unlikely that anyone is using them anymore.
Signed-off-by Eric Biggers <[email protected]>
Applied, thanks.
- Ted