From: Tycho Andersen <tycho.andersen@canonical.com>
Date: Wed, 24 Sep 2014 13:38:40 +0000 (-0500)
Subject: lxc-checkpoint should fail if criu gets signal
X-Git-Tag: lxc-1.1.0.alpha2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c49ecd787d2bf39d0445852115f66f29526151c6;p=thirdparty%2Flxc.git

lxc-checkpoint should fail if criu gets signal

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.andersen@canonical.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index a73719166..94ecc6845 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)) {