Re: [PATCH 2/2] fstests: give user friendly prompts for already mounted dir

hejianet <hejianet@xxxxxxxxx> · Mon, 11 Jan 2016 13:20:08 +0800

在 1/11/16 7:29 AM, Dave Chinner 写道:
On Thu, Jan 07, 2016 at 02:37:29PM +0800, Jia He wrote:
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
Should use a temporary local variable rather than looking at the
mount table twice. e.g.

	mount_rec=`_mount | grep -F $SCRATCH_DEV`
	echo $mount_rec | grep -q $SCRATCH_MNT
	if [ $? -ne 0 ]; then
		# new error message
		echo $mount_rec
	fi
Thanks， Dave
v3 is sending.

B.R.
Justin

Cheers,

Dave.

--
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






