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

XFS Quota tests were unaware of usrquota and grpquota mount options

Browse Source 
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:
Brad Scarlett
2008-12-02 04:56:16 +00:00
parent 67cb6d33b5
commit 286a747ccd
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
134
+6 -3
View File
@@ -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
common.quota
+2
View File
@@ -167,7 +167,9 @@ _qmount_option()
# thanks to "quota" which will match with "uquota" and "gquota" etc.
export MOUNT_OPTIONS=`echo $MOUNT_OPTIONS \
| sed -e 's/uquota/QUOTA/g' \
-e 's/usrquota/QUOTA/g' \
-e 's/gquota/QUOTA/g' \
-e 's/grpquota/QUOTA/g' \
-e 's/pquota/QUOTA/g' \
-e 's/quota/QUOTA/g' \
-e 's/uqnoenforce/QUOTA/g' \