From 6028ccc7216a9ede4ce7b4da34b01716b9cc8bff Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 10 Jan 2017 13:29:53 -0500 Subject: [PATCH] container-selinux-2:2.2-3 --- container-selinux.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/container-selinux.spec b/container-selinux.spec index a6e71bb..80f30fd 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -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 - 2:2.2-3 +- properly disable docker module in %post + * Sat Jan 07 2017 Lokesh Mandvekar - 2:2.2-2 - depend on selinux-policy-targeted - relabel docker-latest* files as well