apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

nfs: recognise IPv6 export in _require_scratch_nocheck()

Browse Source 
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>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Eryu Guan
2015-04-01 11:28:18 +11:00
committed by Dave Chinner
parent 822390a5f0
commit 6000122596
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/rc
+4 -2
View File
@@ -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