b=16261

i=Yong.Fan
local.sh MOUNTOPT fix

diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index b385c1d..dceb554 100644 (file)
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -56,9 +56,9 @@ MKFSOPT=""
 [ "x$MKFSOPT" != "x" ] &&
     MKFSOPT="--mkfsoptions=\\\"$MKFSOPT\\\""
 [ "x$SECLEVEL" != "x" ] &&
-    MOUNTOPT=$MOUNTOPT" --param mdt.sec_level=$SECLEVEL"
+    MKFSOPT=$MKFSOPT" --param mdt.sec_level=$SECLEVEL"
 [ "x$MDSCAPA" != "x" ] &&
-    MOUNTOPT=$MOUNTOPT" --param mdt.capa=$MDSCAPA"
+    MKFSOPT=$MKFSOPT" --param mdt.capa=$MDSCAPA"
 [ "x$mdsfailover_HOST" != "x" ] &&
     MDSOPT=$MDSOPT" --failnode=`h2$NETTYPE $mdsfailover_HOST`"
 [ "x$STRIPE_BYTES" != "x" ] &&
@@ -77,9 +77,9 @@ MKFSOPT=""
 [ "x$MKFSOPT" != "x" ] &&
     MKFSOPT="--mkfsoptions=\\\"$MKFSOPT\\\""
 [ "x$SECLEVEL" != "x" ] &&
-    MOUNTOPT=$MOUNTOPT" --param ost.sec_level=$SECLEVEL"
+    MKFSOPT=$MKFSOPT" --param ost.sec_level=$SECLEVEL"
 [ "x$OSSCAPA" != "x" ] &&
-    MOUNTOPT=$MOUNTOPT" --param ost.capa=$OSSCAPA"
+    MKFSOPT=$MKFSOPT" --param ost.capa=$OSSCAPA"
 [ "x$ostfailover_HOST" != "x" ] &&
     OSTOPT=$OSTOPT" --failnode=`h2$NETTYPE $ostfailover_HOST`"
 OST_MKFS_OPTS="--ost --fsname=$FSNAME --device-size=$OSTSIZE --mgsnode=$MGSNID --param sys.timeout=$TIMEOUT $MKFSOPT $OSTOPT $OST_MKFS_OPTS"
@@ -88,7 +88,6 @@ MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS:-"-o loop,user_xattr,acl"}
 OST_MOUNT_OPTS=${OST_MOUNT_OPTS:-"-o loop"}
 
 #client
-MOUNTOPT=""
 MOUNT=${MOUNT:-/mnt/${FSNAME}}
 MOUNT1=${MOUNT1:-$MOUNT}
 MOUNT2=${MOUNT2:-${MOUNT}2}