X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsetup-nfs.sh;h=218eb5833127a45dafe473209a6cdd59922ca00b;hb=79020798bdcc09477b0b4d05b1d35e2432909aab;hp=7863d407c92e34a4563409a29fc0720eeea61516;hpb=5d37670e8507563db556879041c7992936aefa56;p=fs%2Flustre-release.git diff --git a/lustre/tests/setup-nfs.sh b/lustre/tests/setup-nfs.sh index 7863d40..218eb58 100755 --- a/lustre/tests/setup-nfs.sh +++ b/lustre/tests/setup-nfs.sh @@ -23,7 +23,9 @@ setup_nfs() { do_nodes $LUSTRE_CLIENT "service nfs restart" || return 1 - do_nodes $NFS_CLIENTS "service rpcidmapd restart" || return 1 + do_nodes $NFS_CLIENTS "chkconfig --list rpcidmapd 2>/dev/null | + grep -q rpcidmapd && service rpcidmapd restart || + true" do_nodes $LUSTRE_CLIENT "exportfs -o $export_opts_v *:$MNTPNT \ && exportfs -v" || return 1 @@ -50,8 +52,10 @@ cleanup_nfs() { echo -e "\nUnmounting NFS clients..." do_nodes $NFS_CLIENTS "umount -f $MNTPNT" || return 1 - echo -e "\nUnexporting Lustre filesystem..." - do_nodes $NFS_CLIENTS "service rpcidmapd stop" || return 1 + echo -e "\nUnexporting Lustre filesystem..." + do_nodes $NFS_CLIENTS "chkconfig --list rpcidmapd 2>/dev/null | + grep -q rpcidmapd && service rpcidmapd stop || + true" do_nodes $LUSTRE_CLIENT "service nfs stop" || return 1