When testing NFS over IPv6, the user will set a $TEST_DEV of the form
[fe80::42]:/export. The use of square brackets surrounding the IPv6
address is an accepted convention, but grep and awk think that our IPv6
address is actually a regex and tries to evaluate it instead. The
result is that xfstests reports our filesystem "is busy or already
mounted".
This patch fixes the IPv6 problem by telling awk and grep to treat
$TEST_DEV as a fixed string rather than a regex.
Signed-off-by: Anna Schumaker <[email protected]>
---
common/rc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/rc b/common/rc
index 747cf72..5f24eb0 100644
--- a/common/rc
+++ b/common/rc
@@ -810,13 +810,13 @@ _df_device()
fi
$DF_PROG 2>/dev/null | $AWK_PROG -v what=$1 '
- match($1,what) && NF==1 {
+ ($1==what) && (NF==1) {
v=$1
getline
print v, $0
exit
}
- match($1,what) {
+ ($1==what) {
print
exit
}
@@ -1132,10 +1132,10 @@ _require_test()
esac
# mounted?
- if _mount | grep -q $TEST_DEV
+ if _mount | grep -F -q $TEST_DEV
then
# if it's mounted, make sure its on $TEST_DIR
- if ! _mount | grep $TEST_DEV | grep -q $TEST_DIR
+ if ! _mount | grep -F $TEST_DEV | grep -q $TEST_DIR
then
echo "\$TEST_DEV is mounted but not on \$TEST_DIR - aborting"
exit 1
--
2.1.2
On 10/29/2014 07:33 PM, Dave Chinner wrote:
> On Wed, Oct 29, 2014 at 03:32:07PM -0400, Anna Schumaker wrote:
>> When testing NFS over IPv6, the user will set a $TEST_DEV of the form
>> [fe80::42]:/export. The use of square brackets surrounding the IPv6
>> address is an accepted convention, but grep and awk think that our IPv6
>> address is actually a regex and tries to evaluate it instead. The
>> result is that xfstests reports our filesystem "is busy or already
>> mounted".
>>
>> This patch fixes the IPv6 problem by telling awk and grep to treat
>> $TEST_DEV as a fixed string rather than a regex.
>>
>> Signed-off-by: Anna Schumaker <[email protected]>
>
> Seems sensible, but it needs comments so that when someone copies
> the code they know why it's using these sorts of matches.
Sure. I'll add that in, thanks!
>
> Cheers,
>
> Dave.
>
On Wed, Oct 29, 2014 at 03:32:07PM -0400, Anna Schumaker wrote:
> When testing NFS over IPv6, the user will set a $TEST_DEV of the form
> [fe80::42]:/export. The use of square brackets surrounding the IPv6
> address is an accepted convention, but grep and awk think that our IPv6
> address is actually a regex and tries to evaluate it instead. The
> result is that xfstests reports our filesystem "is busy or already
> mounted".
>
> This patch fixes the IPv6 problem by telling awk and grep to treat
> $TEST_DEV as a fixed string rather than a regex.
>
> Signed-off-by: Anna Schumaker <[email protected]>
Seems sensible, but it needs comments so that when someone copies
the code they know why it's using these sorts of matches.
Cheers,
Dave.
--
Dave Chinner
[email protected]