On Wed, Sep 24, 2014 at 08:38:40AM -0500, Tycho Andersen wrote:
> The ->checkpoint() API call didn't exit correctly if criu was killed by a
> signal instead of exiting, so lxc-checkpoint didn't fail correctly as a 
> result.
> 
> Signed-off-by: Tycho Andersen <tycho.ander...@canonical.com>

Acked-by: Stéphane Graber <stgra...@ubuntu.com>

> ---
>  src/lxc/lxccontainer.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
> index a737191..94ecc68 100644
> --- a/src/lxc/lxccontainer.c
> +++ b/src/lxc/lxccontainer.c
> @@ -3929,6 +3929,10 @@ out_unlock:
>                                       goto out_fini_handler;
>                               }
>                       }
> +             } else {
> +                     ERROR("CRIU was killed with signal %d\n", 
> WTERMSIG(status));
> +                     error = true;
> +                     goto out_fini_handler;
>               }
>  
>               if (lxc_poll(c->name, handler)) {
> -- 
> 1.9.1
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel@lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com

Attachment: signature.asc
Description: Digital signature

_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

Reply via email to