X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-krb5.sh;h=5306591969b15986ff60230a384b18787d1369c5;hb=c56f7675bfb17b3847b38044153e86550ced3c8e;hp=6d3ba8e4d88b891900becab0663d61905fff7843;hpb=8cffc4a0255d007d358e7e1ed843bacb4d9c7f7c;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity-krb5.sh b/lustre/tests/sanity-krb5.sh
index 6d3ba8e..5306591 100755
--- a/lustre/tests/sanity-krb5.sh
+++ b/lustre/tests/sanity-krb5.sh
@@ -719,7 +719,7 @@ test_102() {
 run_test 102 "survive from insanely fast flavor switch"
 
 test_150() {
-	local save_opts
+	local mount_opts
 	local count
 	local clients=$CLIENTS
 
@@ -736,18 +736,14 @@ test_150() {
 	zconf_umount_clients $clients $MOUNT || return 1
 
 	# mount client with conflict flavor - should fail
-	save_opts=$MOUNTOPT
-	MOUNTOPT="$MOUNTOPT,mgssec=krb5p"
-	zconf_mount_clients $clients $MOUNT &&
+	mount_opts="${MOUNT_OPTS:+$MOUNT_OPTS,}mgssec=krb5p"
+	zconf_mount_clients $clients $MOUNT $mount_opts &&
 	    error "mount with conflict flavor should have failed"
-	MOUNTOPT=$save_opts
 
 	# mount client with same flavor - should succeed
-	save_opts=$MOUNTOPT
-	MOUNTOPT="$MOUNTOPT,mgssec=null"
-	zconf_mount_clients $clients $MOUNT ||
+	mount_opts="${MOUNT_OPTS:+$MOUNT_OPTS,}mgssec=null"
+	zconf_mount_clients $clients $MOUNT $mount_opts ||
 	    error "mount with same flavor should have succeeded"
-	MOUNTOPT=$save_opts
 	zconf_umount_clients $clients $MOUNT || return 2
 
 	# mount client with default flavor - should succeed