LU-10994 test: remove netdisk from obdfilter-survey

[fs/lustre-release.git] / lustre / tests / setup-nfs.sh

diff --git a/lustre/tests/setup-nfs.sh b/lustre/tests/setup-nfs.sh
index d5d54ca..ab3afff 100755 (executable)
--- a/lustre/tests/setup-nfs.sh
+++ b/lustre/tests/setup-nfs.sh
@@ -23,13 +23,16 @@ setup_nfs() {
         mount -t rpc_pipefs sunrpc /var/lib/nfs/rpc_pipefs; }" || return 1
     sleep 5
 
-       do_nodes $LUSTRE_CLIENT "echo $MNTPNT *\($export_opts_v\) \
-                                >> /etc/exports" || return 1
+       # get rid of old $MNTPNT entries in /etc/exports
+       do_nodes $LUSTRE_CLIENT "sed -i '/${MNTPNT##*/}/d' /etc/exports &&
+                       echo $MNTPNT *\($export_opts_v\) >> /etc/exports" ||
+                       return 1
 
        # restart nfs server according to distro
        do_nodes $LUSTRE_CLIENT "{ [[ -e /etc/SuSE-release ]] &&
                                 service nfsserver restart; } ||
-                                service nfs restart" || return 1
+                                service nfs restart ||
+                                service nfs-server restart" || return 1
 
        do_nodes $NFS_CLIENTS "chkconfig --list rpcidmapd 2>/dev/null |
                               grep -q rpcidmapd && service rpcidmapd restart ||
@@ -65,9 +68,10 @@ cleanup_nfs() {
 
        do_nodes $LUSTRE_CLIENT "{ [[ -e /etc/SuSE-release ]] &&
                                 service nfsserver stop; } ||
-                                service nfs stop" || return 1
+                                service nfs stop ||
+                                service nfs-server stop" || return 1
 
-       do_nodes $LUSTRE_CLIENT "sed -i '/^${MNTPNT##*/}/d' /etc/exports" || return 1
+       do_nodes $LUSTRE_CLIENT "sed -i '/${MNTPNT##*/}/d' /etc/exports" || return 1
 
        do_nodes $LUSTRE_CLIENT "exportfs -v"
 }