| 1 |
commit: 6b78a58c9ac825ecd450d100cd269d29761dbe03 |
| 2 |
Author: Daniel Cordero <catalyst <AT> 0xdc <DOT> io> |
| 3 |
AuthorDate: Thu Feb 4 11:07:18 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 21 02:05:34 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6b78a58c |
| 7 |
|
| 8 |
catalyst: Clean up chroot directory on success |
| 9 |
|
| 10 |
The embedded and livecd-stage2 targets override the action sequence |
| 11 |
without calling set_completion_action_sequences. This would leave the |
| 12 |
temporary build environment unpacked on the filesystem. |
| 13 |
|
| 14 |
Signed-off-by: Daniel Cordero <catalyst <AT> 0xdc.io> |
| 15 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 16 |
|
| 17 |
catalyst/targets/embedded.py | 2 +- |
| 18 |
catalyst/targets/livecd_stage2.py | 2 +- |
| 19 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py |
| 22 |
index b677b226..01ad035d 100644 |
| 23 |
--- a/catalyst/targets/embedded.py |
| 24 |
+++ b/catalyst/targets/embedded.py |
| 25 |
@@ -53,8 +53,8 @@ class embedded(StageBase): |
| 26 |
self.empty, |
| 27 |
self.clean, |
| 28 |
self.capture, |
| 29 |
- self.clear_autoresume, |
| 30 |
]) |
| 31 |
+ self.set_completion_action_sequences() |
| 32 |
|
| 33 |
def set_root_path(self): |
| 34 |
self.settings["root_path"] = normpath("/tmp/mergeroot") |
| 35 |
|
| 36 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
| 37 |
index 774702f8..832e0998 100644 |
| 38 |
--- a/catalyst/targets/livecd_stage2.py |
| 39 |
+++ b/catalyst/targets/livecd_stage2.py |
| 40 |
@@ -108,4 +108,4 @@ class livecd_stage2(StageBase): |
| 41 |
self.setup_overlay, |
| 42 |
self.create_iso, |
| 43 |
]) |
| 44 |
- self.finish_sequence.append(self.clear_autoresume) |
| 45 |
+ self.set_completion_action_sequences() |
Archives