From bd1cd556deb0556cc52bb82226f338c3f9169d15 Mon Sep 17 00:00:00 2001
From: pschwan <pschwan>
Date: Sat, 13 Jul 2002 23:42:21 +0000
Subject: [PATCH] Don't load /etc/lustre/lustre.cfg if config files were passed
 on the command line.

---
 lustre/tests/common.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lustre/tests/common.sh b/lustre/tests/common.sh
index c5f9341..802d8aa 100644
--- 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
-- 
1.8.3.1