From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Mon, 9 Sep 2013 20:35:52 +0000 (-0500)
Subject: error.c: don't return error if container init signaled
X-Git-Tag: lxc-1.0.0.alpha2~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fc7e0a593960e2a6c5523868a0393681209ffc4;p=thirdparty%2Flxc.git

error.c: don't return error if container init signaled

We log that at INFO level in case it is needed.  However, in a modern
kernel a container which was shut down using 'shutdown' will always
have been signaled with SIGINT.  Making lxc-start return an error to
reflect that seems overkill.

It's *conceivable* that someone is depending on this behavior, so I'm
sending this out for anyone to NACK, but if I hear no complaints I'll
apply.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/error.c b/src/lxc/error.c
index 15e6ab0bd..46c34bbc4 100644
--- a/src/lxc/error.c
+++ b/src/lxc/error.c
@@ -50,7 +50,6 @@ extern int  lxc_error_set_and_log(int pid, int status)
 
 	if (WIFSIGNALED(status)) {
 		int signal = WTERMSIG(status);
-		ret = ret + 128 + signal;
 
 		INFO("child <%d> ended on signal (%d)", pid, signal);
 	}