From 600012259615c8064404c455f2a901315004a293 Mon Sep 17 00:00:00 2001 From: Eryu Guan Date: Wed, 1 Apr 2015 11:28:18 +1100 Subject: [PATCH] nfs: recognise IPv6 export in _require_scratch_nocheck() This commit 73dfa4a common: Fixes for testing NFS over IPv6 adds NFS over IPv6 support, and commit 76c5f3c common: re-enable tests that require scratch dev on NFS enables NFS tests on scratch device. Now do the same updates to _require_scratch_nocheck() to enable NFS over IPv6 support on scratch device. Signed-off-by: Eryu Guan Reviewed-by: Brian Foster Signed-off-by: Dave Chinner --- common/rc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/rc b/common/rc index 857308a8..fbb19c2c 100644 --- a/common/rc +++ b/common/rc @@ -1111,10 +1111,12 @@ _require_scratch_nocheck() esac # mounted? - if _mount | grep -q $SCRATCH_DEV + # 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 then # if it's mounted, make sure its on $SCRATCH_MNT - if ! _mount | grep $SCRATCH_DEV | grep -q $SCRATCH_MNT + if ! _mount | grep -F $SCRATCH_DEV | grep -q $SCRATCH_MNT then echo "\$SCRATCH_DEV is mounted but not on \$SCRATCH_MNT - aborting" exit 1 -- 2.39.5