X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsetup-cifs.sh;h=9b91e43eaa13ec9733d43357a240a178b3c40b7e;hp=9815f1e31a9e921a19ba0e450b32628dcdbcce80;hb=0f9c30fc32b0558bd62a319cbe78b3883b500987;hpb=1bf48948a99f51ede84a467a23c59c55eb055d7b

diff --git a/lustre/tests/setup-cifs.sh b/lustre/tests/setup-cifs.sh
index 9815f1e..9b91e43 100644
--- a/lustre/tests/setup-cifs.sh
+++ b/lustre/tests/setup-cifs.sh
@@ -50,7 +50,9 @@ EOF"
 	do_node $smbsrv "testparm -s >$smbsmall"
 	do_node $smbsrv "testparm -s $smbsmall >$smbconf"
 
-	do_node $smbsrv "echo $smbpasswd | tee - | smbpasswd -a $smbuser -s"
+	do_node $smbsrv "echo $smbpasswd | tee - | smbpasswd -a $smbuser -s" ||
+		do_node $smbsrv "printf '$smbpasswd\n$smbpasswd\n' |\
+			tee - | smbpasswd -a $smbuser -s"
 }
 
 restore_config_smb() {
@@ -92,6 +94,6 @@ cleanup_cifs() {
 	local smbclients=${3}
 
 	echo -e "\nUnmounting CIFS clients..."
-	do_nodes $smbclients "umount -f $smbclimntpt" || return 1
+	zconf_umount_clients $smbclients $smbclimntpt -f || return 1
 	do_node $smbsrv "service smb stop"
 }