diff options
| author |   Daniel Cordero <catalyst@0xdc.io> | 2020-05-21 17:32:47 +0000 |
|---|---|---|
| committer |   Matt Turner <mattst88@gentoo.org> | 2020-06-05 14:08:42 -0700 |
| commit | d2dd86b8f21337133d9d8c744c5f3fdd96867cd5 (patch) | |
| tree | 35e874abd5e9d09b15bd3d72cf82462b19113319 | |
| parent | embedded: use destpath to clean mergeroot (diff) | |
| download | catalyst-d2dd86b8f21337133d9d8c744c5f3fdd96867cd5.tar.gz catalyst-d2dd86b8f21337133d9d8c744c5f3fdd96867cd5.tar.bz2 catalyst-d2dd86b8f21337133d9d8c744c5f3fdd96867cd5.zip | |
embedded: copy root overlay into destpath
When using a merge subpath (e.g. the embedded target's /tmp/mergeroot),
root_overlay() copies the overlay into the seed stage, rather than the subpath.
Copy the files into destpath. When not using a subpath, destpath equals
chroot_path (so other stages are not affected).
Signed-off-by: Matt Turner <mattst88@gentoo.org>
| -rw-r--r-- | catalyst/base/stagebase.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index ab1d409b..c2cc2c3e 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -838,7 +838,7 @@ class StageBase(TargetBase, ClearBase, GenBase): "/root_overlay"]: if os.path.exists(x): log.info('Copying root_overlay: %s', x) - cmd(['rsync', '-a', x + '/', self.settings['chroot_path']], + cmd(['rsync', '-a', x + '/', self.settings['destpath']], env=self.env) def bind(self): |