mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
Dont hard code paths ni test 050, and fix common.quota macros on Debian setups.
Merge of master-melb:xfs-cmds:26021a by kenmcd.
This commit is contained in:
@@ -83,10 +83,8 @@ _exercise()
|
||||
# keep the blocksize and data size for dd later
|
||||
. $tmp.mkfs
|
||||
|
||||
|
||||
_qmount
|
||||
|
||||
|
||||
# Figure out whether we're doing large allocations
|
||||
# (bail out if they're so large they stuff the test up)
|
||||
_test_inode_flag extsz-inherit $SCRATCH_MNT
|
||||
@@ -175,7 +173,7 @@ _qmount_option()
|
||||
}
|
||||
|
||||
cat >$tmp.projects <<EOF
|
||||
1:/mnt/scratch
|
||||
1:$SCRATCH_MNT
|
||||
EOF
|
||||
|
||||
cat >$tmp.projid <<EOF
|
||||
|
||||
+3
-3
@@ -34,8 +34,8 @@ _require_nobody()
|
||||
grep -q '^nobody' /etc/passwd
|
||||
[ $? -ne 0 ] && _notrun "/etc/passwd does not contain user nobody."
|
||||
|
||||
grep -q '^nobody' /etc/group
|
||||
[ $? -ne 0 ] && _notrun "/etc/group does not contain user nobody."
|
||||
egrep -q '^no(body|group)' /etc/group
|
||||
[ $? -ne 0 ] && _notrun "/etc/group does not contain nobody/nogroup."
|
||||
}
|
||||
|
||||
# create a file as a specific user (uid)
|
||||
@@ -81,7 +81,7 @@ _choose_uid()
|
||||
|
||||
_choose_gid()
|
||||
{
|
||||
grep '^nobody' /etc/group | perl -ne '@a = split(/:/); END { printf "id=%d name=%s\n", $a[2],$a[0] }'
|
||||
egrep '^no(body|group)' /etc/group | perl -ne '@a = split(/:/); END { printf "id=%d name=%s\n", $a[2],$a[0] }'
|
||||
}
|
||||
|
||||
_choose_prid()
|
||||
|
||||
Reference in New Issue
Block a user