From 5784eac871d35f8efa211b001d213f5db819054a Mon Sep 17 00:00:00 2001 From: grev Date: Tue, 17 Jun 2008 17:28:00 +0000 Subject: [PATCH] b=16090 i=Deen move export ${facet}_svc from start fn to mount_facet fn --- lustre/tests/test-framework.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index beb3308..3ebd2ce 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -271,6 +271,13 @@ mount_facet() { do_facet ${facet} mount -t lustre ${!opt} $@ ${!dev} ${MOUNT%/*}/${facet} RC=${PIPESTATUS[0]} + if [ $RC -eq 0 ]; then + label=$(do_facet ${facet} "e2label ${!dev}") + [ -z "$label" ] && echo no label for ${!dev} && exit 1 + eval export ${facet}_svc=${label} + echo Started ${label} + fi + if [ $RC -ne 0 ]; then echo "mount -t lustre $@ ${!dev} ${MOUNT%/*}/${facet}" echo "Start of ${!dev} on ${facet} failed ${RC}" @@ -294,12 +301,6 @@ start() { do_facet ${facet} mkdir -p ${MOUNT%/*}/${facet} mount_facet ${facet} RC=$? - if [ $RC -eq 0 ]; then - label=$(do_facet ${facet} "e2label ${device}") - [ -z "$label" ] && echo no label for ${device} && exit 1 - eval export ${facet}_svc=${label} - echo Started ${label} - fi return $RC } -- 1.8.3.1