From d67c9f367dbc3aeedb565b78f9a1ca30b1a4dbf9 Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Tue, 16 Feb 2016 08:27:59 -0500 Subject: [PATCH] Only relabel /var/lib/docker on initial install Signed-off-by: Dan Walsh Upstream-commit: 443ada574da41f20cdd3708e2dee3091dd363afb Component: engine --- .../engine/hack/make/.build-rpm/docker-engine-selinux.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/engine/hack/make/.build-rpm/docker-engine-selinux.spec b/components/engine/hack/make/.build-rpm/docker-engine-selinux.spec index 69e5faa3f5..706af36ac6 100644 --- a/components/engine/hack/make/.build-rpm/docker-engine-selinux.spec +++ b/components/engine/hack/make/.build-rpm/docker-engine-selinux.spec @@ -44,7 +44,7 @@ Conflicts: docker-selinux # Relabel files %global relabel_files() \ - /sbin/restorecon -R %{_bindir}/docker %{_localstatedir}/run/docker.sock %{_localstatedir}/run/docker.pid %{_sharedstatedir}/docker %{_sysconfdir}/docker %{_localstatedir}/log/docker %{_localstatedir}/log/lxc %{_localstatedir}/lock/lxc %{_usr}/lib/systemd/system/docker.service /root/.docker &> /dev/null || : \ + /sbin/restorecon -R %{_bindir}/docker %{_localstatedir}/run/docker.sock %{_localstatedir}/run/docker.pid %{_sysconfdir}/docker %{_localstatedir}/log/docker %{_localstatedir}/log/lxc %{_localstatedir}/lock/lxc %{_usr}/lib/systemd/system/docker.service /root/.docker &> /dev/null || : \ %description SELinux policy modules for use with Docker @@ -83,6 +83,9 @@ fi if %{_sbindir}/selinuxenabled ; then %{_sbindir}/load_policy %relabel_files + if [ $1 -eq 1 ]; then + restorecon -R %{_sharedstatedir}/docker + fi fi %postun