From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 13 Jan 2021 23:47:35 +0000 (+0000)
Subject: builder: Drop private network setting
X-Git-Tag: 0.9.28~1285^2~860
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca40d0eefbc5f2eaabb9338ea9c8bc89cc3be52b;p=pakfire.git

builder: Drop private network setting

The build chroot will never have network enabled, but the shell does.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/contrib/config/builder.conf b/contrib/config/builder.conf
index b42b24ee0..e39e4d871 100644
--- a/contrib/config/builder.conf
+++ b/contrib/config/builder.conf
@@ -20,12 +20,6 @@ file = /var/log/pakfire-builder.log
 # Create loop devices in build environment.
 #use_loop_devices = true
 
-# Use private network.
-# Setting this to true will result in the build
-# chroot having its own network - i.e. no network connection
-# to the outside world.
-#private_network = false
-
 [ccache]
 # Turn on compression to get more files into the cache.
 #compress = true
diff --git a/src/pakfire/builder.py b/src/pakfire/builder.py
index 8c310ad0b..f83ac943a 100644
--- a/src/pakfire/builder.py
+++ b/src/pakfire/builder.py
@@ -76,7 +76,6 @@ class Builder(object):
 			"enable_loop_devices" : self.config.get_bool("builder", "use_loop_devices", True),
 			"enable_ccache"       : self.config.get_bool("builder", "use_ccache", True),
 			"buildroot_tmpfs"     : self.config.get_bool("builder", "use_tmpfs", False),
-			"private_network"     : self.config.get_bool("builder", "private_network", False),
 		}
 
 		# Get ccache settings.
@@ -473,7 +472,7 @@ class BuilderContext(object):
 			# Run the transaction
 			transaction.run()
 
-	def build(self, package, private_network=True, shell=True):
+	def build(self, package, shell=True):
 		# Install build environment
 		packages = [
 			"@Build",