[gentoo-catalyst] [PATCH] Clean up chroot directory on success

[gentoo-catalyst] [PATCH] Clean up chroot directory on success

[Daniel Cordero]

From: Daniel Cordero <catalyst@0xdc.io>

The embedded and livecd-stage2 targets override the action sequence
without calling set_completion_action_sequences. This would leave the
temporary build environment unpacked on the filesystem.

Signed-off-by: Daniel Cordero <catalyst@0xdc.io>
---
 catalyst/targets/embedded.py      | 2 +-
 catalyst/targets/livecd_stage2.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index 918b36bf..102b5edd 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -62,8 +62,8 @@ class embedded(StageBase):
             "empty",
             "clean",
             "capture",
-            "clear_autoresume",
         ])
+        self.set_completion_action_sequences()
 
     def set_root_path(self):
         self.settings["root_path"] = normpath("/tmp/mergeroot")
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 3606047f..b8bb56a2 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -117,4 +117,4 @@ class livecd_stage2(StageBase):
                 "setup_overlay",
                 "create_iso",
             ])
-        self.finish_sequence.append("clear_autoresume")
+        self.set_completion_action_sequences()
-- 
2.26.2

Re: [gentoo-catalyst] [PATCH] Clean up chroot directory on success

[Matt Turner]

On Thu, Feb 4, 2021 at 6:08 AM Daniel Cordero <gentoo.catalyst@xxoo.ws> wrote:
>
> From: Daniel Cordero <catalyst@0xdc.io>
>
> The embedded and livecd-stage2 targets override the action sequence
> without calling set_completion_action_sequences. This would leave the
> temporary build environment unpacked on the filesystem.

Thanks. Seems like a good idea.

I had to rebase this, because about 10 days before this patch was sent
I changed the sequences to be self.function rather than "function" in
commit 440a379ae94e (catalyst: Store references to functions). Please
try to rebase your patches onto master in the future.

> Signed-off-by: Daniel Cordero <catalyst@0xdc.io>
> ---
>  catalyst/targets/embedded.py      | 2 +-
>  catalyst/targets/livecd_stage2.py | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
> index 918b36bf..102b5edd 100644
> --- a/catalyst/targets/embedded.py
> +++ b/catalyst/targets/embedded.py
> @@ -62,8 +62,8 @@ class embedded(StageBase):
>              "empty",
>              "clean",
>              "capture",

I think we need to also remove capture here, since
set_completion_action_sequences() begins with

    if "fetch" not in self.settings["options"]:
        self.finish_sequence.append(self.capture)

I'll make that change locally when I commit this.

> -            "clear_autoresume",
>          ])
> +        self.set_completion_action_sequences()
>
>      def set_root_path(self):
>          self.settings["root_path"] = normpath("/tmp/mergeroot")
> diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
> index 3606047f..b8bb56a2 100644
> --- a/catalyst/targets/livecd_stage2.py
> +++ b/catalyst/targets/livecd_stage2.py
> @@ -117,4 +117,4 @@ class livecd_stage2(StageBase):
>                  "setup_overlay",
>                  "create_iso",
>              ])
> -        self.finish_sequence.append("clear_autoresume")
> +        self.set_completion_action_sequences()
> --
> 2.26.2
>
>