| Message ID | 1472233238.14055.0.camel@trentalancia.net (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 08/26/2016 01:40 PM, Guido Trentalancia wrote: > Fix the Makefile in the policy subdirectory of the SELinux testsuite > so that it builds correctly on the standard Reference Policy which > does not have the same booleans available on Red Hat. > > Signed-off-by: Guido Trentalancia <guido@trentalancia.net> > --- > policy/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > --- selinux-testsuite-git-23082016-orig/policy/Makefile 2016-08-23 20:50:08.527633728 +0200 > +++ selinux-testsuite-git-23082016/policy/Makefile 2016-08-26 19:37:13.195088500 +0200 > @@ -68,7 +69,7 @@ load_rhel: all > > load_general: all > # General policy load > - /usr/sbin/setsebool allow_domain_fd_use=0 > + /usr/sbin/getsebool allow_domain_fd_use > /dev/null && /usr/sbin/setsebool allow_domain_fd_use=0 || : > $(SEMODULE) -i test_policy/test_policy.pp Don't you need 2>&1 as well to suppress error output when the boolean does not exist? > > unload_rhel: > @@ -77,7 +78,7 @@ unload_rhel: > > unload_general: > # General policy unload > - /usr/sbin/setsebool allow_domain_fd_use=1 > + /usr/sbin/getsebool allow_domain_fd_use > /dev/null && /usr/sbin/setsebool allow_domain_fd_use=1 || : > $(SEMODULE) -r test_policy > > clean: >
--- selinux-testsuite-git-23082016-orig/policy/Makefile 2016-08-23 20:50:08.527633728 +0200 +++ selinux-testsuite-git-23082016/policy/Makefile 2016-08-26 19:37:13.195088500 +0200 @@ -68,7 +69,7 @@ load_rhel: all load_general: all # General policy load - /usr/sbin/setsebool allow_domain_fd_use=0 + /usr/sbin/getsebool allow_domain_fd_use > /dev/null && /usr/sbin/setsebool allow_domain_fd_use=0 || : $(SEMODULE) -i test_policy/test_policy.pp unload_rhel: @@ -77,7 +78,7 @@ unload_rhel: unload_general: # General policy unload - /usr/sbin/setsebool allow_domain_fd_use=1 + /usr/sbin/getsebool allow_domain_fd_use > /dev/null && /usr/sbin/setsebool allow_domain_fd_use=1 || : $(SEMODULE) -r test_policy clean:
Fix the Makefile in the policy subdirectory of the SELinux testsuite so that it builds correctly on the standard Reference Policy which does not have the same booleans available on Red Hat. Signed-off-by: Guido Trentalancia <guido@trentalancia.net> --- policy/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)