From: brian <brian>
Date: Sat, 17 Jun 2006 16:50:25 +0000 (+0000)
Subject: /mnt might not be on a writable filesystem, must $MOUNT should be, so just
X-Git-Tag: v1_7_100~1^90~8^2~104
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=829688249ecd80438f15a5f2c3f6162303efc306;p=fs%2Flustre-release.git

/mnt might not be on a writable filesystem, must $MOUNT should be, so just
use its parent directory.
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index e93882c..81f7fb0 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -133,12 +133,12 @@ start() {
     shift
     device=$1
     shift
-    echo "Starting ${facet}: $@ ${device} /mnt/${facet}"
-    do_facet ${facet} mkdir -p /mnt/${facet}
-    do_facet ${facet} mount -t lustre $@ ${device} /mnt/${facet} 
+    echo "Starting ${facet}: $@ ${device} ${MOUNT%/*}/${facet}"
+    do_facet ${facet} mkdir -p ${MOUNT%/*}/${facet}
+    do_facet ${facet} mount -t lustre $@ ${device} ${MOUNT%/*}/${facet} 
     RC=${PIPESTATUS[0]}
     if [ $RC -ne 0 ]; then
-        echo mount -t lustre $@ ${device} /mnt/${facet} 
+        echo mount -t lustre $@ ${device} ${MOUNT%/*}/${facet} 
         echo Start of ${device} on ${facet} failed ${RC}
     else 
         do_facet ${facet} sync
@@ -159,10 +159,10 @@ stop() {
     HOST=`facet_active_host $facet`
     [ -z $HOST ] && echo stop: no host for $facet && return 0
 
-    running=`do_facet ${facet} "grep -c /mnt/${facet}' ' /proc/mounts" | grep -v "CMD: "`
+    running=`do_facet ${facet} "grep -c ${MOUNT%/*}/${facet}' ' /proc/mounts" | grep -v "CMD: "`
     if [ ${running} -ne 0 ]; then
-        echo "Stopping /mnt/${facet} (opts:$@)"
-        do_facet ${facet} umount -d $@ /mnt/${facet}
+        echo "Stopping ${MOUNT%/*}/${facet} (opts:$@)"
+        do_facet ${facet} umount -d $@ ${MOUNT%/*}/${facet}
     fi
 
     [ -e /proc/fs/lustre ] && grep "ST " /proc/fs/lustre/devices && echo "service didn't stop" && exit 1