From: brian Date: Sat, 18 Jun 2005 03:15:29 +0000 (+0000) Subject: Allow sanity.sh to work with zconf. X-Git-Tag: v1_7_100~1175 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=5ce045541925df8704b93119a967649f00fb7ae3 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 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -187,10 +187,13 @@ 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 - MOUNT="`mount | awk '/^'$NAME' .* lustre_lite / { print $3 }'`" + MOUNT="`mounted_lustre_filesystems`" [ -z "$MOUNT" ] && error "NAME=$NAME not mounted" I_MOUNTED=yes fi