From d14f463834ca7fe66a1b7a3c23fc3ca64d333737 Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Fri, 28 Dec 2007 19:10:35 +0000
Subject: [PATCH] b=12962 i=Nathan.Rutman
set MDS_MOUNT_OPTS correctly for liblustre test
---
lustre/tests/acceptance-small.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 5570704179..c5b6b40d46 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -246,7 +246,12 @@ for NAME in $CONFIGS; do
[ -f /etc/modprobe.conf ] && MODPROBECONF=/etc/modprobe.conf
[ -f /etc/modprobe.d/Lustre ] && MODPROBECONF=/etc/modprobe.d/Lustre
- LNETOPTS="$(awk '/^options lnet/ { print $0}' $MODPROBECONF | sed 's/^options lnet //g') accept=all" MDS_MOUNT_OPTS="${MDS_MOUNT_OPTS},noacl" $SETUP
+ LNETOPTS="$(awk '/^options lnet/ { print $0}' $MODPROBECONF | \
+ sed 's/^options lnet //g') accept=all" \
+ MDS_MOUNT_OPTS=$(echo $MDS_MOUNT_OPTS | sed 's/^[ \t]*//;s/[ \t]*$//') \
+ MDS_MOUNT_OPTS="${MDS_MOUNT_OPTS},noacl" \
+ MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS/#,/-o } \
+ $SETUP
export LIBLUSTRE_MOUNT_POINT=$MOUNT2
export LIBLUSTRE_MOUNT_TARGET=$MGSNID:/$FSNAME
export LIBLUSTRE_TIMEOUT=`cat /proc/sys/lustre/timeout`
--
GitLab