summaryrefslogtreecommitdiff
path: root/morphlib
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-12-19 12:04:30 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-12-19 12:04:30 +0000
commitd5c95a623884b7a837d99911cf1967675ae5dee6 (patch)
treedb31bc302ca9ee94691cf0a78fb6cb7a009637c8 /morphlib
parent11555718e14ab147bd5da8b093d49279ad9d3ee8 (diff)
downloadmorph-d5c95a623884b7a837d99911cf1967675ae5dee6.tar.gz
Don't mount /dev/shm in bootstrap mode.
There's no chroot used in bootstrap mode, so the host's /dev/shm can be used, and nothing in the world will be looking to /src/tmp/staging/tmpXXX/dev/shm for anything.
Diffstat (limited to 'morphlib')
-rw-r--r--morphlib/stagingarea.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/morphlib/stagingarea.py b/morphlib/stagingarea.py
index 5810bf3c..42fdd076 100644
--- a/morphlib/stagingarea.py
+++ b/morphlib/stagingarea.py
@@ -190,9 +190,10 @@ class StagingArea(object):
shutil.rmtree(self.dirname)
- to_mount = (
+ to_mount_in_staging = (
('dev/shm', 'tmpfs', 'none'),
)
+ to_mount_in_bootstrap = ()
def ccache_dir(self, source): #pragma: no cover
ccache_dir = self._app.settings['compiler-cache-dir']
@@ -275,10 +276,10 @@ class StagingArea(object):
binds = ()
if self.use_chroot:
- mounts = self.to_mount
+ mounts = self.to_mount_in_staging
else:
mounts = [(os.path.join(self.dirname, target), type, source)
- for target, type, source in self.to_mount]
+ for target, type, source in self.to_mount_in_bootstrap]
cmdline = morphlib.util.containerised_cmdline(
argv, cwd=kwargs.pop('cwd', '/'),
root=chroot_dir, mounts=mounts,