From a8168c768e1f26989e71e0e85bf3e88fcad4437f Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Oct 06 2015 18:53:36 +0000 Subject: Should only relabel /var/lib/docker on initial install --- diff --git a/docker.spec b/docker.spec index 5b0ea9d..6dc21a2 100644 --- a/docker.spec +++ b/docker.spec @@ -46,7 +46,7 @@ %global _format() export %1=""; for x in %{modulenames}; do %1+=%2; %1+=" "; done; # Relabel files -%global relabel_files() %{_sbindir}/restorecon -R %{_bindir}/%{repo} %{_localstatedir}/run/%{repo}.sock %{_localstatedir}/run/%{repo}.pid %{_sharedstatedir}/%{repo} %{_sysconfdir}/%{repo} %{_localstatedir}/log/%{repo} %{_localstatedir}/log/lxc %{_localstatedir}/lock/lxc %{_unitdir}/%{repo}.service %{_sysconfdir}/%{repo} &> /dev/null || : +%global relabel_files() %{_sbindir}/restorecon -R %{_bindir}/%{repo} %{_localstatedir}/run/%{repo}.sock %{_localstatedir}/run/%{repo}.pid %{_sysconfdir}/%{repo} %{_localstatedir}/log/%{repo} %{_localstatedir}/log/lxc %{_localstatedir}/lock/lxc %{_unitdir}/%{repo}.service %{_sysconfdir}/%{repo} &> /dev/null || : # Version of SELinux we were using %if 0%{?fedora} >= 22 @@ -515,8 +515,11 @@ fi %_format MODULES %{_datadir}/selinux/packages/$x.pp.bz2 %{_sbindir}/semodule -n -s %{selinuxtype} -i $MODULES if %{_sbindir}/selinuxenabled ; then -%{_sbindir}/load_policy -%relabel_files + %{_sbindir}/load_policy + %relabel_files + if [ $1 -eq 1 ]; then + retorecon -R %{_sharedstatedir}/%{repo} + fi fi %endif # with_selinux