commit: d2dd86b8f21337133d9d8c744c5f3fdd96867cd5
Author: Daniel Cordero <catalyst <AT> 0xdc <DOT> io>
AuthorDate: Thu May 21 17:32:47 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 5 21:08:42 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d2dd86b8
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 <AT> gentoo.org>
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 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):
