From: Daniel Cordero <[email protected]>
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).
---
This is unpacked after the build. I don't see any possible reason why the
embedded target would need customisations after this point, and it
didn't match the behaviour of e.g. stage4/root_overlay.
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index ed9bb697..67c2d3e3 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -841,7 +841,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):
--
2.26.2
