Explorar el Código

Merge pull request #20353 from rhatdan/selinux

Only relabel /var/lib/docker on initial install
Jess Frazelle hace 9 años
padre
commit
d445eb4808
Se han modificado 1 ficheros con 4 adiciones y 1 borrados
  1. 4 1
      hack/make/.build-rpm/docker-engine-selinux.spec

+ 4 - 1
hack/make/.build-rpm/docker-engine-selinux.spec

@@ -44,7 +44,7 @@ Conflicts: docker-selinux
 
 
 # Relabel files
 # Relabel files
 %global 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
 %description
 SELinux policy modules for use with Docker
 SELinux policy modules for use with Docker
@@ -83,6 +83,9 @@ fi
 if %{_sbindir}/selinuxenabled ; then
 if %{_sbindir}/selinuxenabled ; then
     %{_sbindir}/load_policy
     %{_sbindir}/load_policy
     %relabel_files
     %relabel_files
+    if [ $1 -eq 1 ]; then
+	restorecon -R %{_sharedstatedir}/docker
+    fi
 fi
 fi
 
 
 %postun
 %postun