[rpm-ostree/f21] Add a patch to disable ro /etc bind mount so we work inside Docker

[Colin Walters]

commit c24e8e561198c6ab9f10afa3845c9ffb5c3903f0
Author: Colin Walters <walters at verbum.org>
Date:   Thu Mar 19 10:13:34 2015 -0400

    Add a patch to disable ro /etc bind mount so we work inside Docker
    
      (More convenient to test)

 ...able-etc-RO-bind-mount-breaks-in-Docker-c.patch | 29 ++++++++++++++++++++++
 rpm-ostree.spec                                    |  7 +++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
---
diff --git a/0001-compose-Disable-etc-RO-bind-mount-breaks-in-Docker-c.patch b/0001-compose-Disable-etc-RO-bind-mount-breaks-in-Docker-c.patch
new file mode 100644
index 0000000..5bd5353
--- /dev/null
+++ b/0001-compose-Disable-etc-RO-bind-mount-breaks-in-Docker-c.patch
@@ -0,0 +1,29 @@
+From a81279f67834c3eba02febce9e86341568f6146b Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 19 Mar 2015 09:51:41 -0400
+Subject: [PATCH] compose: Disable /etc RO bind mount - breaks in Docker
+ containers
+
+For reasons I haven't yet debugged - it makes the Docker bind mount of
+/etc/resolv.conf go away.
+---
+ src/rpmostree-compose-builtin-tree.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/rpmostree-compose-builtin-tree.c b/src/rpmostree-compose-builtin-tree.c
+index fc1220f..84efb7c 100644
+--- a/src/rpmostree-compose-builtin-tree.c
++++ b/src/rpmostree-compose-builtin-tree.c
+@@ -853,9 +853,6 @@ rpmostree_compose_builtin_tree (int             argc,
+             goto out;
+         }
+ 
+-      /* Protect the system's /etc and /usr */
+-      if (!_rpmostree_libcontainer_bind_mount_readonly ("/etc", error))
+-        goto out;
+       if (!_rpmostree_libcontainer_bind_mount_readonly ("/usr", error))
+         goto out;
+     }
+-- 
+1.8.3.1
+
diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index 17d2a17..eb2f53f 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -1,10 +1,11 @@
 Summary: Client side upgrade program and server side compose tool
 Name: rpm-ostree
 Version: 2015.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 #VCS: https://github.com/cgwalters/rpm-ostree
 # This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot"
 Source0: rpm-ostree-%{version}.tar.xz
+Patch0: 0001-compose-Disable-etc-RO-bind-mount-breaks-in-Docker-c.patch
 License: LGPLv2+
 URL: https://github.com/cgwalters/rpm-ostree
 # We always run autogen.sh
@@ -48,6 +49,10 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
 %{_mandir}/man*/*.gz
 
 %changelog
+* Thu Mar 19 2015 Colin Walters <walters at redhat.com> - 2015.3-2
+- Add a patch to disable ro /etc bind mount so we work inside Docker
+  (More convenient to test)
+
 * Tue Mar 17 2015 Colin Walters <walters at redhat.com> - 2015.3-1
 - Backport newer upstream release to fix uid/gid allocation issues;
   see https://git.fedorahosted.org/cgit/fedora-atomic.git/commit/?id=debbecbc6cec7ae494f26703d0ae28b2c53b0e26