diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/include.rc | 6 | ||||
| -rw-r--r-- | tests/nfs.rc | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/include.rc b/tests/include.rc index 9f32e88f5f5..56d0aa44b9f 100644 --- a/tests/include.rc +++ b/tests/include.rc @@ -21,11 +21,11 @@ OSTYPE=$(uname -s) M0LOG=${M0LOG:="mnt-glusterfs-0.log"}; # Log file for 0th FUSE mount point -ENV_RC=$(dirname $0)/../env.rc +ENV_RC=$(dirname $0)/env.rc if [ ! -f $ENV_RC ]; then - ENV_RC=$(dirname $0)/../../env.rc + ENV_RC=$(dirname $0)/../env.rc if [ ! -f $ENV_RC ]; then - ENV_RC=$(dirname $0)/../../../env.rc + ENV_RC=$(dirname $0)/../../env.rc fi fi diff --git a/tests/nfs.rc b/tests/nfs.rc index 2140f311c33..feb493bc866 100644 --- a/tests/nfs.rc +++ b/tests/nfs.rc @@ -23,7 +23,7 @@ function mount_nfs () local m=$2 local opt=$3 if [ ! -z "$opt" ]; then opt=",$opt"; fi - opt="soft,intr,vers=3$opt" + opt="soft,intr,nfsvers=3,proto=tcp$opt" nopt="" for o in ${opt//,/ }; do @@ -61,6 +61,7 @@ function mount_nfs () nopt="${nopt}$o" done + echo mount -t nfs -o $nopt $e $m > /dev/tty mount -t nfs -o $nopt $e $m } |