mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
XFS Quota tests were unaware of usrquota and grpquota mount options
Merge of master-melb:xfs-cmds:32619a by kenmcd. Fix 134 so it is notrun if grpquota mount option is detected.
This commit is contained in:
@@ -54,10 +54,13 @@ _require_scratch
|
||||
_scratch_mkfs_xfs >/dev/null 2>&1
|
||||
|
||||
#if pquota's already in mount options then we dont need to enable
|
||||
[ `echo $MOUNT_OPTIONS | grep -c gquota` -eq 0 -a `echo $MOUNT_OPTIONS | grep -c gquota` -eq 0 ] &&\
|
||||
EXTRA_MOUNT_OPTIONS="-o pquota"
|
||||
[ `echo $MOUNT_OPTIONS | grep -c gquota` -gt 0 -o `echo $MOUNT_OPTIONS | grep -c gquota` -gt 0 ] &&\
|
||||
|
||||
# we can't run with group quotas
|
||||
if ( `echo $MOUNT_OPTIONS | grep -q gquota` || `echo $MOUNT_OPTIONS | grep -q grpquota` )
|
||||
then
|
||||
_notrun "Can't run with group quotas enabled"
|
||||
fi
|
||||
EXTRA_MOUNT_OPTIONS="-o pquota"
|
||||
|
||||
if ! _scratch_mount "$EXTRA_MOUNT_OPTIONS" >$tmp.out 2>&1
|
||||
then
|
||||
|
||||
Reference in New Issue
Block a user