[docker-io] 80-docker.rules included for epel

Lokesh Mandvekar lsm5 at fedoraproject.org
Sun Dec 1 17:21:11 UTC 2013


commit 909a8903f1b3e86edaa5fcfca1d10e6c81fe01bc
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Sun Dec 1 11:21:02 2013 -0600

    80-docker.rules included for epel
    
    Signed-off-by: Lokesh Mandvekar <lsm5 at redhat.com>

 docker-io.spec |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index d6a55a0..e9a5085 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -116,11 +116,8 @@ install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/docker
 install -d %{buildroot}%{_initddir}
 install -p -m 755 %{SOURCE3} %{buildroot}%{_initddir}/docker
 %endif
-# not included in epel until verified, only fedora for now
-%if 0%{?fedora} >= 18
 install -d %{buildroot}%{_sysconfdir}/udev/rules.d
 install -p -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/udev/rules.d
-%endif
 
 %pre
 getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
@@ -168,10 +165,8 @@ fi
 %{_sysconfdir}/bash_completion.d/docker.bash
 %{_datadir}/zsh/site-functions/_docker
 %dir %{_sharedstatedir}/docker
-%if 0%{?fedora} >= 19
 %dir %{_sysconfdir}/udev/rules.d
 %{_sysconfdir}/udev/rules.d/80-docker.rules
-%endif
 
 %changelog
 * Sat Nov 30 2013 Lokesh Mandvekar <lsm5 at redhat.com> - 0.7.0-12
@@ -180,6 +175,8 @@ fi
 - firewall-cmd --add-masquerade after docker daemon start in unit file
   (Michal Fojtik <mfojtik at redhat.com>), continue if not present (Michael Young
   <m.a.young at durham.ac.uk>)
+- 80-docker.rules included for epel too, ENV variables need to be changed for
+  udisks1
 
 * Fri Nov 29 2013 Marek Goldmann <mgoldman at redhat.com> - 0.7.0-11
 - Redirect docker log to /var/log/docker (epel only)


More information about the scm-commits mailing list