]> git.ipfire.org Git - pakfire.git/commitdiff
builder: Drop private network setting
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 13 Jan 2021 23:47:35 +0000 (23:47 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 13 Jan 2021 23:47:35 +0000 (23:47 +0000)
The build chroot will never have network enabled, but the shell does.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
contrib/config/builder.conf
src/pakfire/builder.py

index b42b24ee0f76bf943a24f9a2b84c22d7b7b18184..e39e4d8718c508a2640fe26fe3421a2d14e2f275 100644 (file)
@@ -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
index 8c310ad0bff9d36b092541b1740200bca58eb60a..f83ac943a69ab2751b1dc0b63d015a0848b60416 100644 (file)
@@ -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",