diff options
| author | Pádraig Brady <P@draigBrady.com> | 2014-11-21 15:27:41 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2014-11-21 15:30:13 +0000 |
| commit | 0e942fdba6c7e6372f778a94dcd64479934166d9 (patch) | |
| tree | 38cded4794b312882bbe59956571a07616177bd4 /tests/misc | |
| parent | 222d7ac0c4f5f005438c534f3aba62fd94d96dc2 (diff) | |
| download | coreutils-0e942fdba6c7e6372f778a94dcd64479934166d9.tar.xz | |
tests: chcon: avoid false failure with newer selinux
file_t is now mapped to unlabeled_t as per:
http://danwalsh.livejournal.com/68189.html
Therefore use the latter to ensure we match correctly.
This is needed on >= Fedora 21 for example,
while it also works on earlier releases.
Diffstat (limited to 'tests/misc')
| -rwxr-xr-x | tests/misc/chcon.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/misc/chcon.sh b/tests/misc/chcon.sh index ec5739671..ed40063a4 100755 --- a/tests/misc/chcon.sh +++ b/tests/misc/chcon.sh @@ -44,7 +44,7 @@ stat --printf='g|%C\n' g >> out || fail=1 # Change the individual parts of the context, one by one. u2=user_u r2=object_r -t2=file_t +t2=unlabeled_t for i in --user=$u2 --role=$r2 --type=$t2 --range=$range; do chcon $i f || fail=1 stat --printf="f|$i|"'%C\n' f >> out || fail=1 @@ -63,8 +63,8 @@ f|--user=$u2|$u2:$r1:$t1:$range f|--role=$r2|$u2:$r2:$t1:$range f|--type=$t2|$u2:$r2:$t2:$range f|--range=$range|$u2:$r2:$t2:$range -f|-uroot|root:object_r:file_t:$range -f|-robject_r|root:object_r:file_t:$range +f|-uroot|root:object_r:$t2:$range +f|-robject_r|root:object_r:$t2:$range f|-ttmp_t|root:object_r:tmp_t:$range EOF |