Re: [PATCH 7/9] common: recognise NFS export over IPv6 in _require_scratch_nocheck()

[Brian Foster <bfoster@redhat.com>]

On Fri, Mar 20, 2015 at 06:16:56PM +0800, Eryu Guan wrote:
> 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 <eguan@redhat.com>
> ---

Seems fine...

Reviewed-by: Brian Foster <bfoster@redhat.com>

>  common/rc | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/common/rc b/common/rc
> index 857308a..fbb19c2 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.1.0
> 
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html