MOUNT=${MOUNT:-/mnt/${FSNAME}}
MOUNT1=${MOUNT1:-$MOUNT}
MOUNT2=${MOUNT2:-${MOUNT}2}
-MOUNTOPT=${MOUNTOPT:-"user_xattr,acl,flock"}
+MOUNTOPT=${MOUNTOPT:-"-o user_xattr,acl,flock"}
DIR=${DIR:-$MOUNT}
DIR1=${DIR:-$MOUNT1}
DIR2=${DIR2:-$MOUNT2}
}
remount_client() {
- local SAVEMOUNTOPT=$MOUNTOPT
- MOUNTOPT="remount,$1"
+ local mountopt="-o remount,$1"
local MOUNTPATH=$2
echo "remount '$1' lustre on ${MOUNTPATH}....."
- zconf_mount `hostname` $MOUNTPATH || return 96
- MOUNTOPT=$SAVEMOUNTOPT
+ zconf_mount `hostname` $MOUNTPATH "$mountopt" || return 96
}
umount_client() {
}
zconf_mount() {
- local OPTIONS
local client=$1
local mnt=$2
- # Only supply -o to mount if we have options
- if [ -n "$MOUNTOPT" ]; then
- OPTIONS="-o $MOUNTOPT"
- fi
+ local OPTIONS=${3:-$MOUNTOPT}
+
local device=$MGSNID:/$FSNAME
if [ -z "$mnt" -o -z "$FSNAME" ]; then
echo Bad zconf mount command: opt=$OPTIONS dev=$device mnt=$mnt
local mnt=$2
local OPTIONS=${3:-$MOUNTOPT}
- # Only supply -o to mount if we have options
- if [ "$OPTIONS" ]; then
- OPTIONS="-o $OPTIONS"
- fi
local device=$MGSNID:/$FSNAME
if [ -z "$mnt" -o -z "$FSNAME" ]; then
echo Bad zconf mount command: opt=$OPTIONS dev=$device mnt=$mnt