[docker-io] udev rules added BZ 1034095

[Lokesh Mandvekar]

commit ab27c4d7383a3c0ba484ff901dfbb7326fdafa0f
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Thu Nov 28 12:08:12 2013 -0600

    udev rules added BZ 1034095
    
    Signed-off-by: Lokesh Mandvekar <lsm5 at redhat.com>

 80-docker.rules |    2 ++
 docker-io.spec  |   20 +++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/80-docker.rules b/80-docker.rules
new file mode 100644
index 0000000..cbf5471
--- /dev/null
+++ b/80-docker.rules
@@ -0,0 +1,2 @@
+SUBSYSTEM=="block", ENV{DM_NAME}=="docker-*", ENV{UDISKS_IGNORE}="1"
+SUBSYSTEM=="block", DEVPATH=="/devices/virtual/block/loop*", ATTR{loop/backing_file}=="/var/lib/docker/*", ENV{UDISKS_IGNORE}="1"
diff --git a/docker-io.spec b/docker-io.spec
index 8607b54..4cb0222 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,7 +14,7 @@
 
 Name:           docker-io
 Version:        0.7.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Automates deployment of containerized applications
 License:        ASL 2.0
 
@@ -31,6 +31,7 @@ Source1:        docker.service
 # having .sysvinit and .sysconfig makes things clear
 Source2:        docker.sysconfig
 Source3:        docker.sysvinit
+Source4:        80-docker.rules
 BuildRequires:  gcc
 BuildRequires:  glibc-static
 BuildRequires:  golang(github.com/gorilla/mux)
@@ -51,7 +52,7 @@ Requires:       lxc
 Requires:       tar
 # https://bugzilla.redhat.com/show_bug.cgi?id=1035436
 # this won't be needed for rhel7+
-%if 0%{?rhel} <= 7
+%if 0%{?rhel} >= 6
 Requires:       bridge-utils
 %endif
 # https://bugzilla.redhat.com/show_bug.cgi?id=1034919
@@ -76,8 +77,8 @@ rm -rf vendor
 %if 0%{?rhel} >= 6
 %patch1 -p1 -b docker-0.7-el6-docs.patch
 %patch2 -p1 -b brctl
-%patch3 -p1 -b docker-0.7.0-iptables-fix.patch
 %endif
+%patch3 -p1 -b docker-0.7.0-iptables-fix.patch
 
 %build
 mkdir _build
@@ -115,6 +116,11 @@ install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/docker
 install -d %{buildroot}%{_initddir}
 install -p -m 755 %{SOURCE3} %{buildroot}%{_initddir}/docker
 %endif
+# don't submit release 10 to epel until verified, only fedora for now
+%if 0%{?fedora} >= 19
+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
@@ -162,8 +168,16 @@ 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
+* Thu Nov 28 2013 Lokesh Mandvekar <lsm5 at redhat.com> - 0.7.0-10
+- udev rules added for fedora >= 19 BZ 1034095
+- epel testing pending
+
 * Thu Nov 28 2013 Lokesh Mandvekar <lsm5 at redhat.com> - 0.7.0-9
 - requires and started after firewalld