builder: Do not mount root here any more

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

diff --git a/contrib/config/builder.conf b/contrib/config/builder.conf
index e39e4d8718c508a2640fe26fe3421a2d14e2f275..1ad0f05daacea51026cd0100670040a5a18aed21 100644 (file)
--- a/contrib/config/builder.conf
+++ b/contrib/config/builder.conf
@@ -12,11 +12,6 @@ file = /var/log/pakfire-builder.log
 # See also the [ccache] section.
 #use_ccache = true
 
-# Create build environments in a tmpfs.
-# This requires a lot of RAM.
-# Only enable if you know what your are doing.
-#use_tmpfs = false
-
 # Create loop devices in build environment.
 #use_loop_devices = true
 

diff --git a/src/pakfire/builder.py b/src/pakfire/builder.py
index f5b53bcef53835b84acde78f685db6c6be39b7a0..114550b22dc01c9fb731720d28d85133ce6de880 100644 (file)
--- a/src/pakfire/builder.py
+++ b/src/pakfire/builder.py
@@ -82,7 +82,6 @@ class Builder(object):
                # Settings array.
                self.settings = {
                        "enable_ccache"       : self.config.get_bool("builder", "use_ccache", True),
-                       "buildroot_tmpfs"     : self.config.get_bool("builder", "use_tmpfs", True),
                }
 
                # Add settings from keyword arguments
@@ -184,10 +183,6 @@ class Builder(object):
                """
                os.makedirs(self.path)
 
-               # Mount ramdisk if enabled
-               if self.settings.get("buildroot_tmpfs"):
-                       _pakfire.mount("pakfire_root", self.path, "tmpfs")
-
                # Bind-mount the ccache if enabled
                if self.settings.get("enable_ccache"):
                        if not os.path.exists(CCACHE_CACHE_DIR):
@@ -204,7 +199,6 @@ class Builder(object):
                """
                mountpoints = (
                        "%s/var/cache/ccache" % self.path,
-                       self.path,
                )
 
                for mp in mountpoints: