diff options
Diffstat (limited to 'morphlib/builder.py')
-rw-r--r-- | morphlib/builder.py | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/morphlib/builder.py b/morphlib/builder.py index 04ebd149..86b04a4a 100644 --- a/morphlib/builder.py +++ b/morphlib/builder.py @@ -533,13 +533,25 @@ class SystemBuilder(BuilderBase): # pragma: no cover for a_name, artifact in self.source.artifacts.iteritems(): handle = self.local_artifact_cache.put(artifact) - try: fs_root = self.staging_area.destdir(self.source) self.unpack_strata(fs_root) - self.write_metadata(fs_root, a_name) - self.run_system_integration_commands(fs_root) - unslashy_root = fs_root[1:] + overlay_root = self.staging_area.overlay_upperdir( + self.source) + editable_root = self.staging_area.overlaydir(self.source) + workdir = os.path.join(self.staging_area.dirname, + 'overlayfs-workdir') + if not os.path.exists(workdir): + os.makedirs(workdir) + options = '-olowerdir=%s,upperdir=%s,workdir=%s' % \ + (fs_root, overlay_root, workdir) + morphlib.fsutils.mount(self.app.runcmd, + 'overlay-%s' % a_name, + editable_root, + 'overlay', options) + self.write_metadata(editable_root, a_name) + self.run_system_integration_commands(editable_root) + unslashy_root = editable_root[1:] def uproot_info(info): info.name = relpath(info.name, unslashy_root) if info.islnk(): @@ -549,15 +561,21 @@ class SystemBuilder(BuilderBase): # pragma: no cover tar = tarfile.open(fileobj=handle, mode="w", name=a_name) self.app.status(msg='Constructing tarball of rootfs', chatty=True) - tar.add(fs_root, recursive=True, filter=uproot_info) + tar.add(editable_root, recursive=True, filter=uproot_info) tar.close() except BaseException as e: logging.error(traceback.format_exc()) self.app.status(msg='Error while building system', error=True) + if editable_root and os.path.exists(editable_root): + morphlib.fsutils.unmount(self.app.runcmd, + editable_root) handle.abort() raise else: + if editable_root and os.path.exists(editable_root): + morphlib.fsutils.unmount(self.app.runcmd, + editable_root) handle.close() self.save_build_times() |