From cc04992d24fd68719cba0a05c7bff745f3bb64c4 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Sep 07 2018 17:57:27 +0000
Subject: PR#1073: Merge PR:897


Merges #1073
https://pagure.io/koji/pull-request/1073

---

diff --git a/builder/kojid b/builder/kojid
index 44fe917..98598f3 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -242,6 +242,8 @@ class BuildRoot(object):
             if hasattr(self.options, k):
                 opts[k] = getattr(self.options, k)
         opts['buildroot_id'] = self.id
+        if self.setup_dns:
+            opts['rpmbuild_networking'] = True
         opts['use_host_resolv'] = self.setup_dns
         opts['install_group'] = self.install_group
         opts['maven_opts'] = self.maven_opts
diff --git a/koji/__init__.py b/koji/__init__.py
index f8156ae..4fb7ce6 100644
--- a/koji/__init__.py
+++ b/koji/__init__.py
@@ -1443,6 +1443,7 @@ def genMockConfig(name, arch, managed=False, repoid=None, tag_name=None, **opts)
         # Use the group data rather than a generated rpm
         'chroot_setup_cmd': 'groupinstall %s' % opts.get('install_group', 'build'),
         # don't encourage network access from the chroot
+        'rpmbuild_networking': opts.get('use_host_resolv', False),
         'use_host_resolv': opts.get('use_host_resolv', False),
         # Don't let a build last more than 24 hours
         'rpmbuild_timeout': opts.get('rpmbuild_timeout', 86400)
diff --git a/tests/test_lib/data/mock/internaldev.out b/tests/test_lib/data/mock/internaldev.out
index a9bd710..1d8eaf8 100644
--- a/tests/test_lib/data/mock/internaldev.out
+++ b/tests/test_lib/data/mock/internaldev.out
@@ -5,6 +5,7 @@ config_opts['chroot_setup_cmd'] = 'groupinstall build'
 config_opts['chroothome'] = '/builddir'
 config_opts['internal_dev_setup'] = False
 config_opts['root'] = 'ROOTNAME'
+config_opts['rpmbuild_networking'] = False
 config_opts['rpmbuild_timeout'] = 86400
 config_opts['target_arch'] = 'x86_64'
 config_opts['use_host_resolv'] = False
diff --git a/tests/test_lib/data/mock/internaldev2.out b/tests/test_lib/data/mock/internaldev2.out
index 034dc79..4cea97f 100644
--- a/tests/test_lib/data/mock/internaldev2.out
+++ b/tests/test_lib/data/mock/internaldev2.out
@@ -5,6 +5,7 @@ config_opts['chroot_setup_cmd'] = 'groupinstall build'
 config_opts['chroothome'] = '/builddir'
 config_opts['internal_dev_setup'] = True
 config_opts['root'] = 'ROOTNAME'
+config_opts['rpmbuild_networking'] = False
 config_opts['rpmbuild_timeout'] = 86400
 config_opts['target_arch'] = 'x86_64'
 config_opts['use_host_resolv'] = False
diff --git a/tests/test_lib/data/mock/simple.out b/tests/test_lib/data/mock/simple.out
index 71d5dae..3aad8ff 100644
--- a/tests/test_lib/data/mock/simple.out
+++ b/tests/test_lib/data/mock/simple.out
@@ -4,6 +4,7 @@ config_opts['basedir'] = '/var/lib/mock'
 config_opts['chroot_setup_cmd'] = 'groupinstall build'
 config_opts['chroothome'] = '/builddir'
 config_opts['root'] = 'ROOTNAME'
+config_opts['rpmbuild_networking'] = False
 config_opts['rpmbuild_timeout'] = 86400
 config_opts['target_arch'] = 'x86_64'
 config_opts['use_host_resolv'] = False