1 |
From: Daniel Cordero <catalyst@××××.io> |
2 |
|
3 |
When using a merge subpath (e.g. the embedded target's /tmp/mergeroot), |
4 |
root_overlay() copies the overlay into the seed stage, rather than the subpath. |
5 |
|
6 |
Copy the files into destpath. When not using a subpath, destpath equals |
7 |
chroot_path (so other stages are not affected). |
8 |
--- |
9 |
This is unpacked after the build. I don't see any possible reason why the |
10 |
embedded target would need customisations after this point, and it |
11 |
didn't match the behaviour of e.g. stage4/root_overlay. |
12 |
|
13 |
catalyst/base/stagebase.py | 2 +- |
14 |
1 file changed, 1 insertion(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
17 |
index ed9bb697..67c2d3e3 100644 |
18 |
--- a/catalyst/base/stagebase.py |
19 |
+++ b/catalyst/base/stagebase.py |
20 |
@@ -841,7 +841,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
21 |
"/root_overlay"]: |
22 |
if os.path.exists(x): |
23 |
log.info('Copying root_overlay: %s', x) |
24 |
- cmd(['rsync', '-a', x + '/', self.settings['chroot_path']], |
25 |
+ cmd(['rsync', '-a', x + '/', self.settings['destpath']], |
26 |
env=self.env) |
27 |
|
28 |
def bind(self): |
29 |
-- |
30 |
2.26.2 |