Allow sanity.sh to work with zconf.

Taken from b1_4 branch.  Thanx nic and adilger.

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index ff6fa73..47e73c3 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -187,10 +187,13 @@ pass() {
        echo PASS $@
 }
 
        echo PASS $@
 }
 

-MOUNT="`mount | awk '/^'$NAME' .* lustre_lite / { print $3 }'`"
+mounted_lustre_filesystems() {
+       awk '($3 ~ "lustre") { print $2 }' /proc/mounts
+}
+MOUNT="`mounted_lustre_filesystems`"

 if [ -z "$MOUNT" ]; then
        sh llmount.sh
 if [ -z "$MOUNT" ]; then
        sh llmount.sh

-       MOUNT="`mount | awk '/^'$NAME' .* lustre_lite / { print $3 }'`"
+       MOUNT="`mounted_lustre_filesystems`"

        [ -z "$MOUNT" ] && error "NAME=$NAME not mounted"
        I_MOUNTED=yes
 fi
        [ -z "$MOUNT" ] && error "NAME=$NAME not mounted"
        I_MOUNTED=yes
 fi