common: add names device mounted errors

This adds user friendly prompts to output the already mounted point
from _mount.  xfstests will do the cleanup (ie. umount) and user can
not get the mount name information when directory is already
mounted.

Signed-off-by: Jia He <hejianet@gmail.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/common/rc b/common/rc
index 716c2154139ae63bf6de1d78dcce0dce09c83f6d..c1fd58e26e507904234e8ab7f3472db60bc988aa 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -1266,12 +1266,15 @@ _require_scratch_nocheck()
     # mounted?
     # Note that we use -F here so grep doesn't try to interpret an NFS over
     # IPv6 server as a regular expression.
-    if _mount | grep -F -q $SCRATCH_DEV
+    mount_rec=`_mount | grep -F $SCRATCH_DEV`
+    if [ "$mount_rec" ]
     then
         # if it's mounted, make sure its on $SCRATCH_MNT
-        if ! _mount | grep -F $SCRATCH_DEV | grep -q $SCRATCH_MNT
+        if ! echo $mount_rec | 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:"
+            echo $mount_rec
             exit 1
         fi
         # and then unmount it
@@ -1348,12 +1351,15 @@ _require_test()
     # mounted?
     # Note that we use -F here so grep doesn't try to interpret an NFS over
     # IPv6 server as a regular expression.
-    if _mount | grep -F -q $TEST_DEV
+    mount_rec=`_mount | grep -F $TEST_DEV`
+    if [ "$mount_rec" ]
     then
         # if it's mounted, make sure its on $TEST_DIR
-        if ! _mount | grep -F $TEST_DEV | grep -q $TEST_DIR
+        if ! echo $mount_rec | 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:"
+            echo $mount_rec
             exit 1
         fi
     else