From a5cf8a42c2fdec186477497bea0c5dfbee94b0f1 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Tue, 23 Aug 2016 13:33:31 -0500
Subject: [PATCH] add patch to disable bind mounting into image tasks chroots

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
---
 138.patch | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 koji.spec |  7 ++++++-
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 138.patch

diff --git a/138.patch b/138.patch
new file mode 100644
index 0000000..ce35bb5
--- /dev/null
+++ b/138.patch
@@ -0,0 +1,58 @@
+From d70f068cc1e138b3bb58766728424c190fcd77b5 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Aug 23 2016 04:50:22 +0000
+Subject: don't bind-mount /dev for LiveMediaTask (RHBZ #1315541)
+
+
+This is an alternative to https://pagure.io/koji/pull-request/137
+which keeps the /dev bind mount for ApplianceTask and LiveCDTask,
+only dropping it for LiveMediaTask. It seems from the test we
+ran that appliance-creator may still need it, at least for the
+present - some of the createAppliance tasks seemed to hang their
+builders.
+
+---
+
+diff --git a/builder/kojid b/builder/kojid
+index 05438d2..26ae8f2 100755
+--- a/builder/kojid
++++ b/builder/kojid
+@@ -2483,6 +2483,9 @@ class BuildLiveMediaTask(BuildImageTask):
+ # Other chroot-based image handlers should inherit this.
+ class ImageTask(BaseTaskHandler):
+     Methods = []
++    # default to bind mounting /dev, but allow subclasses to change
++    # this
++    bind_opts = {'dirs' : {'/dev' : '/dev',}}
+ 
+     def makeImgBuildRoot(self, buildtag, repoinfo, arch, inst_group):
+         """
+@@ -2497,14 +2500,11 @@ class ImageTask(BaseTaskHandler):
+         @returns: a buildroot object
+         """
+ 
+-        # Here we configure mock to bind mount a set of /dev directories
+-        bind_opts = {'dirs' : {'/dev' : '/dev',}}
+-        if os.path.exists('/selinux'):
+-            bind_opts['dirs']['/selinux'] = '/selinux'
+         rootopts = {'install_group': inst_group,
+                     'setup_dns': True,
+-                    'repo_id': repoinfo['id'],
+-                    'bind_opts' : bind_opts}
++                    'repo_id': repoinfo['id']}
++        if self.bind_opts:
++            rootopts['bind_opts'] = self.bind_opts
+ 
+         broot = BuildRoot(self.session, self.options, buildtag, arch, self.id, **rootopts)
+         broot.workdir = self.workdir
+@@ -2932,6 +2932,9 @@ class LiveMediaTask(ImageTask):
+ 
+     Methods = ['createLiveMedia']
+     _taskWeight = 1.5
++    # For livemedia-creator we do not want to bind mount /dev, see
++    # https://bugzilla.redhat.com/show_bug.cgi?id=1315541
++    bind_opts = {}
+ 
+     def genISOManifest(self, image, manifile):
+         """
+
diff --git a/koji.spec b/koji.spec
index 118b387..a810790 100644
--- a/koji.spec
+++ b/koji.spec
@@ -9,7 +9,7 @@
 
 Name: koji
 Version: 1.10.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: LGPLv2 and GPLv2+
 # koji.ssl libs (from plague) are GPLv2+
 Summary: Build system tools
@@ -17,6 +17,7 @@ Group: Applications/System
 URL: https://pagure.io/fork/ausil/koji/branch/fedora-infra
 Patch0: fedora-config.patch
 Patch1: 0001-enable-dns-to-work-in-runroot-buildroots.patch
+Patch2: 138.patch
 
 Source: koji-%{version}.tar.bz2
 BuildArch: noarch
@@ -159,6 +160,7 @@ koji-web is a web UI to the Koji system.
 %setup -q
 %patch0 -p1 -b orig
 %patch1 -p1
+%patch2 -p1
 
 %build
 
@@ -326,6 +328,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug 23 2016 Dennis Gilmore <dennis@ausil.us> - 1.10.1-12
+- add patch to disable bind mounting into image tasks chroots
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.1-11
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages