Don't load /etc/lustre/lustre.cfg if config files were passed on the command

[fs/lustre-release.git] / lustre / tests / common.sh

diff --git a/lustre/tests/common.sh b/lustre/tests/common.sh
index c5f9341..802d8aa 100644 (file)
--- a/lustre/tests/common.sh
+++ b/lustre/tests/common.sh
@@ -159,7 +159,9 @@ start_acceptor() {
 # can even be sourced into the current shell environment.
 setup_opts() {
        DEF=/etc/lustre/lustre.cfg
-       [ -r $DEF ] && . $DEF && SETUP=y
+        if [ "$#" = 0 -a -r $DEF ]; then
+             . $DEF && SETUP=y
+        fi
 
        for CFG in "$@" ; do
                case $CFG  in