summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-12-12 11:05:31 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-12-12 11:05:31 +0000
commit877992a0e67a174c2e5c7a28e3331b8f6fcb5c94 (patch)
treea5cc895cff207315a16fd36da8b9348c1fb3adb6
parent1bed7a3732e7d6158613609a57fb1f77ec99de1e (diff)
downloadmorph-877992a0e67a174c2e5c7a28e3331b8f6fcb5c94.tar.gz
stagingarea: Mount things inside dirnamebaserock/richardmaw/bugfix/stagingarea-mounts-inside-destdir
-rw-r--r--morphlib/stagingarea.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/morphlib/stagingarea.py b/morphlib/stagingarea.py
index b676d4db..0508047d 100644
--- a/morphlib/stagingarea.py
+++ b/morphlib/stagingarea.py
@@ -274,9 +274,11 @@ class StagingArea(object):
else:
binds = ()
+ mounts = [(os.path.join(self.dirname, target), type, source)
+ for target, type, source in self.to_mount]
cmdline = morphlib.util.containerised_cmdline(
argv, cwd=kwargs.pop('cwd', '/'),
- root=chroot_dir, mounts=self.to_mount,
+ root=chroot_dir, mounts=mounts,
binds=binds, mount_proc=mount_proc,
writable_paths=do_not_mount_dirs)
try: