container-selinux-2:2.2-3

This commit is contained in:
Jonathan Lebon 2017-01-10 13:29:53 -05:00
parent 8602eba442
commit 6028ccc721

View File

@ -35,7 +35,7 @@ Name: container-selinux
Epoch: 2
%endif
Version: 2.2
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2
URL: %{git0}
Summary: SELinux policies for container runtimes
@ -77,7 +77,7 @@ install -d -p %{buildroot}%{_datadir}/selinux/devel/include/services
install -p -m 644 container.if %{buildroot}%{_datadir}/selinux/devel/include/services
install -m 0644 $MODULES %{buildroot}%{_datadir}/selinux/packages
# remove %%{repo}-selinux rpm spec file
# remove spec file
rm -rf container-selinux.spec
%check
@ -89,14 +89,14 @@ if [ $1 -eq 1 ]; then
fi
%_format MODULES %{_datadir}/selinux/packages/$x.pp.bz2
%{_sbindir}/semodule -n -s %{selinuxtype} -r container 2> /dev/null
%{_sbindir}/semodule -n -s %{selinuxtype} -d %{repo} 2> /dev/null
%{_sbindir}/semodule -n -s %{selinuxtype} -d docker 2> /dev/null
%{_sbindir}/semodule -n -s %{selinuxtype} -d gear 2> /dev/null
%{_sbindir}/semodule -n -X 200 -s %{selinuxtype} -i $MODULES > /dev/null
if %{_sbindir}/selinuxenabled ; then
%{_sbindir}/load_policy
%relabel_files
if [ $1 -eq 1 ]; then
restorecon -R %{_sharedstatedir}/%{repo} &> /dev/null || :
restorecon -R %{_sharedstatedir}/docker &> /dev/null || :
fi
fi
@ -117,6 +117,9 @@ fi
%{_datadir}/selinux/*
%changelog
* Tue Jan 10 2017 Jonathan Lebon <jlebon@redhat.com> - 2:2.2-3
- properly disable docker module in %post
* Sat Jan 07 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.2-2
- depend on selinux-policy-targeted
- relabel docker-latest* files as well