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

xfstests: generic/318 use symbolic namespaced ids

Browse Source 
Christoph, I think the following should fix 318 for you.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
Dwight Engen
2013-10-24 20:11:55 +00:00
committed by Rich Johnston
parent 5b8e9ac032
commit c4d4fb21ef
2 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/generic/318
+19 -2
View File
@@ -63,6 +63,23 @@ _require_scratch
_need_to_be_root
_acl_setup_ids
_require_acls
ns_acl1=0
ns_acl2=`expr $acl2 - $acl1`
ns_acl3=`expr $acl3 - $acl1`
_getfacl_filter_nsid()
{
sed \
-e "s/user:$ns_acl1/user:nsid1/" \
-e "s/user:$ns_acl2/user:nsid2/" \
-e "s/user:$ns_acl3/user:nsid3/" \
-e "s/group:$ns_acl1/group:nsid1/" \
-e "s/group:$ns_acl2/group:nsid2/" \
-e "s/group:$ns_acl3/group:nsid3/" \
-e "s/: $ns_acl1/: nsid1/" \
-e "s/: $ns_acl2/: nsid2/" \
-e "s/: $ns_acl3/: nsid3/"
}
_print_getfacls()
{
@@ -70,7 +87,7 @@ _print_getfacls()
getfacl --absolute-names -n $file 2>/dev/null | _filter_scratch | _getfacl_filter_id
echo "From user_ns"
$nsexec -U -M "0 $acl1 1000" -G "0 $acl2 1000" getfacl --absolute-names -n $file 2>/dev/null | _filter_scratch | _getfacl_filter_id
$nsexec -U -M "0 $acl1 1000" -G "0 $acl1 1000" getfacl --absolute-names -n $file 2>/dev/null | _filter_scratch | _getfacl_filter_nsid
}
umount $SCRATCH_DEV >/dev/null 2>&1
@@ -85,7 +102,7 @@ chown $acl1.$acl1 $file
# set acls from init_user_ns, to be checked from inside the userns
setfacl -n -m u:$acl2:rw,g:$acl2:r $file
# set acls from inside userns, to be checked from init_user_ns
$nsexec -s -U -M "0 $acl1 1000" -G "0 $acl2 1000" setfacl -n -m u:root:rx,g:root:x $file
$nsexec -s -U -M "0 $acl1 1000" -G "0 $acl1 1000" setfacl -n -m u:root:rx,g:$ns_acl2:x $file
_print_getfacls
tests/generic/318.out
+10 -10
View File
@@ -13,13 +13,13 @@ other::r--
From user_ns
# file: SCRATCH_MNT/file1
# owner: 0
# group: 65534
# owner: nsid1
# group: nsid1
user::rw-
user:0:r-x #effective:r--
user:1:rw- #effective:r--
user:nsid1:r-x #effective:r--
user:nsid2:rw- #effective:r--
group::r--
group:0:--x #effective:---
group:nsid2:--x #effective:---
mask::r--
other::r--
@@ -39,13 +39,13 @@ other::r--
From user_ns
# file: SCRATCH_MNT/file1
# owner: 0
# group: 65534
# owner: nsid1
# group: nsid1
user::rw-
user:0:r-x #effective:r--
user:1:rw- #effective:r--
user:nsid1:r-x #effective:r--
user:nsid2:rw- #effective:r--
group::r--
group:0:--x #effective:---
group:nsid2:--x #effective:---
mask::r--
other::r--