This adds user friendly prompts to output the already mounted line from _mount.
xfstests will do the cleanup (ie. umount) and user can not get the mount directory
information.
Signed-off-by: Jia He <hejianet@xxxxxxxxx>
---
common/rc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/common/rc b/common/rc
index d33e3fb..5b40fb4 100644
--- a/common/rc
+++ b/common/rc
@@ -1271,7 +1271,9 @@ _require_scratch_nocheck()
# if it's mounted, make sure its on $SCRATCH_MNT
if ! _mount | grep -F $SCRATCH_DEV | grep -q $SCRATCH_MNT
then
- echo "\$SCRATCH_DEV is mounted but not on \$SCRATCH_MNT - aborting"
+ echo "\$SCRATCH_DEV=$SCRATCH_DEV is mounted but not on \$SCRATCH_MNT=$SCRATCH_MNT - aborting"
+ echo "Already mounted result:"
+ _mount | grep -F $SCRATCH_DEV
exit 1
fi
# and then unmount it
@@ -1353,7 +1355,9 @@ _require_test()
# if it's mounted, make sure its on $TEST_DIR
if ! _mount | grep -F $TEST_DEV | grep -q $TEST_DIR
then
- echo "\$TEST_DEV is mounted but not on \$TEST_DIR - aborting"
+ echo "\$TEST_DEV=$TEST_DEV is mounted but not on \$TEST_DIR=$TEST_DIR - aborting"
+ echo "Already mounted result:"
+ _mount | grep -F $TEST_DEV
exit 1
fi
else
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
